1
0
mirror of https://github.com/openSUSE/osc.git synced 2024-12-25 17:36:13 +01:00

remove "need root" autodetection

This kind of guessing can not really work here and leads to failing
builds when using KVM. (eg. when using a preinstallimage)

Removing the code, since we have a now a way to allow the user to
specify building as user via su-wrapper config
This commit is contained in:
Adrian Schröter 2021-03-25 08:59:33 +01:00
parent 4e9dde71b8
commit 6ac7855f4d
2 changed files with 9 additions and 13 deletions

1
NEWS
View File

@ -5,6 +5,7 @@
running the install section to see the result of it (use --stage=i=).
Check the help for more details.
- allow to run build script as non-root, by setting su-wrapper empty
=> osc is not guessing anymore if user builds are wanted
0.172.0
- support --lastsucceeded/--last-succeeded in "osc buildlog", "osc

View File

@ -1291,7 +1291,6 @@ def main(apiurl, opts, argv):
# before
my_build_device = build_root + '/img'
need_root = True
if vm_type:
if config['build-swap']:
my_build_swap = config['build-swap'] % subst
@ -1308,9 +1307,6 @@ def main(apiurl, opts, argv):
vm_options += [ '--vm-swap=' + my_build_swap ]
vm_options += [ '--logfile=%s/.build.log' % build_root ]
if vm_type == 'kvm':
if os.access(build_root, os.W_OK) and os.access('/dev/kvm', os.W_OK):
# so let's hope there's also an fstab entry
need_root = False
if config['build-kernel']:
vm_options += [ '--vm-kernel=' + config['build-kernel'] ]
if config['build-initrd']:
@ -1340,15 +1336,14 @@ def main(apiurl, opts, argv):
cmd += specialcmdopts + vm_options + buildargs
cmd += [ build_descr ]
if need_root:
sucmd = config['su-wrapper'].split()
if sucmd:
if sucmd[0] == 'su':
if sucmd[-1] == '-c':
sucmd.pop()
cmd = sucmd + ['-s', cmd[0], 'root', '--' ] + cmd[1:]
else:
cmd = sucmd + cmd
sucmd = config['su-wrapper'].split()
if sucmd:
if sucmd[0] == 'su':
if sucmd[-1] == '-c':
sucmd.pop()
cmd = sucmd + ['-s', cmd[0], 'root', '--' ] + cmd[1:]
else:
cmd = sucmd + cmd
# change personality, if needed
if hostarch != bi.buildarch and bi.buildarch in change_personality: