Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Do not throw out the whole environment

Browse Source 
It is too risky from a compat perspective.
This commit is contained in:
Demi Marie Obenour 2021-05-14 17:03:52 -04:00
parent 93b8c34053
commit d669068b43
No known key found for this signature in database
GPG Key ID: 28A45C93B0B5B6E0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qubes/storage/lvm.py
View File

@ -232,7 +232,7 @@ def _parse_lvm_cache(lvm_output):
def init_cache(log=logging.getLogger('qubes.storage.lvm')): def init_cache(log=logging.getLogger('qubes.storage.lvm')):
cmd = _init_cache_cmd cmd = _init_cache_cmd
environ={'LC_ALL': 'C.UTF-8', 'PATH': '/usr/sbin:/usr/bin'} environ={'LC_ALL': 'C.UTF-8', **os.environ}
p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
close_fds=True, env=environ) close_fds=True, env=environ)
out, err = p.communicate() out, err = p.communicate()
@ -247,7 +247,7 @@ def init_cache(log=logging.getLogger('qubes.storage.lvm')):
@asyncio.coroutine @asyncio.coroutine
def init_cache_coro(log=logging.getLogger('qubes.storage.lvm')): def init_cache_coro(log=logging.getLogger('qubes.storage.lvm')):
cmd = _init_cache_cmd cmd = _init_cache_cmd
environ={'LC_ALL': 'C.UTF-8', 'PATH': '/usr/sbin:/usr/bin'} environ={'LC_ALL': 'C.UTF-8', **os.environ}
p = yield from asyncio.create_subprocess_exec(*cmd, p = yield from asyncio.create_subprocess_exec(*cmd,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE, stderr=subprocess.PIPE,
@ -780,7 +780,7 @@ def qubes_lvm(cmd, log=logging.getLogger('qubes.storage.lvm')):
''' Call :program:`lvm` to execute an LVM operation ''' ''' Call :program:`lvm` to execute an LVM operation '''
# the only caller for this non-coroutine version is ThinVolume.export() # the only caller for this non-coroutine version is ThinVolume.export()
cmd = _get_lvm_cmdline(cmd) cmd = _get_lvm_cmdline(cmd)
environ={'LC_ALL': 'C.UTF-8', 'PATH': '/usr/sbin:/usr/bin'} environ={'LC_ALL': 'C.UTF-8', **os.environ}
p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
close_fds=True, env=environ) close_fds=True, env=environ)
out, err = p.communicate() out, err = p.communicate()
@ -791,7 +791,7 @@ def qubes_lvm_coro(cmd, log=logging.getLogger('qubes.storage.lvm')):
''' Call :program:`lvm` to execute an LVM operation ''' Call :program:`lvm` to execute an LVM operation
Coroutine version of :py:func:`qubes_lvm`''' Coroutine version of :py:func:`qubes_lvm`'''
environ={'LC_ALL': 'C.UTF-8', 'PATH': '/usr/sbin:/usr/bin'} environ={'LC_ALL': 'C.UTF-8', **os.environ}
if cmd[0] == "remove": if cmd[0] == "remove":
pre_cmd = ['blkdiscard', '-p', '1G', '/dev/'+cmd[1]] pre_cmd = ['blkdiscard', '-p', '1G', '/dev/'+cmd[1]]
p = yield from asyncio.create_subprocess_exec(*pre_cmd, p = yield from asyncio.create_subprocess_exec(*pre_cmd,