mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-01-15 18:16:13 +01:00
Code

Merge branch 'mount_sysfs' of https://github.com/lethliel/osc

Browse Source 
Mount sysfs during "osc chroot". The current implementation
of "osc chroot" is a major pain for plain "su" users, because the
root password has to be entered several times - we should fix this.

Fixes: #354 ("Mount sysfs in chroot")
This commit is contained in:
Marcus Huewe 2017-11-21 12:34:15 +01:00
commit 5791d1bb5c
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
osc/commandline.py
View File

@ -6425,11 +6425,15 @@ Please submit there instead, or use --nodevelproject to force direct submission.
suargs = ' '.join(suwrapper.split()[1:]) suargs = ' '.join(suwrapper.split()[1:])
if suwrapper.startswith('su '): if suwrapper.startswith('su '):
mntproc = [sucmd, '%s mount -n -tproc none %s/proc' % (suargs, buildroot)] mntproc = [sucmd, '%s mount -n -tproc none %s/proc' % (suargs, buildroot)]
mntsys = [sucmd, '%s mount -n -tsysfs none %s/sys' % (suargs, buildroot)]
umntproc = [sucmd, '%s umount %s/proc' % (suargs, buildroot)] umntproc = [sucmd, '%s umount %s/proc' % (suargs, buildroot)]
umntsys = [sucmd, '%s umount %s/sys' % (suargs, buildroot)]
cmd = [sucmd, '%s chroot "%s" su - %s' % (suargs, buildroot, user)] cmd = [sucmd, '%s chroot "%s" su - %s' % (suargs, buildroot, user)]
else: else:
mntproc = [sucmd, 'mount', '-n', '-tproc' , 'none', '%s/proc' % buildroot] mntproc = [sucmd, 'mount', '-n', '-tproc' , 'none', '%s/proc' % buildroot]
mntsys = [sucmd, 'mount', '-n', '-tsysfs' , 'none', '%s/sys' % buildroot]
umntproc = [sucmd, 'umount', '%s/proc' % buildroot] umntproc = [sucmd, 'umount', '%s/proc' % buildroot]
umntsys = [sucmd, 'umount', '%s/sys' % buildroot]
cmd = [sucmd, 'chroot', buildroot, 'su', '-', user] cmd = [sucmd, 'chroot', buildroot, 'su', '-', user]
if suargs: if suargs:
mntproc[1:1] = suargs.split() mntproc[1:1] = suargs.split()
@ -6437,25 +6441,31 @@ Please submit there instead, or use --nodevelproject to force direct submission.
cmd[1:1] = suargs.split() cmd[1:1] = suargs.split()
#signal handler for chroot procfs umount #signal handler for chroot procfs umount
def umount_proc(signum = None, frame = None, ret=1): def umount_handle(signum = None, frame = None, ret=1):
subprocess.call(umntproc) subprocess.call(umntproc)
subprocess.call(umntsys)
sys.exit(ret) sys.exit(ret)
for sig in [signal.SIGTERM, signal.SIGINT, signal.SIGHUP, signal.SIGQUIT]: for sig in [signal.SIGTERM, signal.SIGINT, signal.SIGHUP, signal.SIGQUIT]:
signal.signal(sig, umount_proc) signal.signal(sig, umount_handle)
print('mounting proc: %s' % ' '.join(mntproc)) print('mounting proc: %s' % ' '.join(mntproc))
print('mounting sys: %s' % ' '.join(mntsys))
mount_err = -1 mount_err = -1
mount_err = subprocess.call(mntproc) proc_mount_err = subprocess.call(mntproc)
if mount_err > 0: sys_mount_err = subprocess.call(mntsys)
if proc_mount_err > 0:
print('There was an error mounting proc. Please check mountpoints in chroot') print('There was an error mounting proc. Please check mountpoints in chroot')
if sys_mount_err > 0:
print('There was an error mounting sys. Please check mountpoints in chroot')
print('running: %s' % ' '.join(cmd)) print('running: %s' % ' '.join(cmd))
retval = 0 retval = 0
try: try:
retval = subprocess.call(cmd) retval = subprocess.call(cmd)
finally: finally:
if not mount_err or mount_err == 32: if ((not proc_mount_err or proc_mount_err == 32) and
print('unmounting %s/proc ...' % buildroot) (not sys_mount_err or sys_mount_err == 32)):
umount_proc(ret=retval) print('unmounting %s/proc and %s/sys ...' % (buildroot, buildroot))
umount_handle(ret=retval)
@cmdln.option('', '--csv', action='store_true', @cmdln.option('', '--csv', action='store_true',