valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #51425 from aplanas/backport_51094

Browse Source 
cmdmod: add sysfs into the chroot
This commit is contained in:
Daniel Wozniak 2019-02-01 14:08:59 -07:00 committed by GitHub
commit 2e8bf0589c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
salt/modules/cmdmod.py
View File

@ -3035,12 +3035,16 @@ def run_chroot(root,
'''
__salt__['mount.mount'](
os.path.join(root, 'dev'),
'udev',
'devtmpfs',
fstype='devtmpfs')
__salt__['mount.mount'](
os.path.join(root, 'proc'),
'proc',
fstype='proc')
__salt__['mount.mount'](
os.path.join(root, 'sys'),
'sysfs',
fstype='sysfs')
# Execute chroot routine
sh_ = '/bin/sh'
@ -3092,6 +3096,7 @@ def run_chroot(root,
log.error('Processes running in chroot could not be killed, '
'filesystem will remain mounted')
__salt__['mount.umount'](os.path.join(root, 'sys'))
__salt__['mount.umount'](os.path.join(root, 'proc'))
__salt__['mount.umount'](os.path.join(root, 'dev'))
if hide_output: