kevinheyer/bootstrap-vz
1
0
Fork 0
mirror of https://github.com/kevingruesser/bootstrap-vz.git synced 2025-08-24 15:36:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

umount /sys & /proc when debootstrap is aborted

Browse source
This commit is contained in:
Anders Ingemann 2015-12-12 23:53:13 +01:00
parent 1df2588b23
commit 5883673380
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
bootstrapvz/common/tasks/bootstrap.py
View file

@ -79,8 +79,17 @@ class Bootstrap(Task):
# Optional bootstrapping script to modify the bootstrapping process # Optional bootstrapping script to modify the bootstrapping process
arguments.append(info.bootstrap_script) arguments.append(info.bootstrap_script)
from ..tools import log_check_call try:
log_check_call(executable + options + arguments) from ..tools import log_check_call
log_check_call(executable + options + arguments)
except KeyboardInterrupt:
# Sometimes ../root/sys and ../root/proc are still mounted when
# quitting debootstrap prematurely. This break the cleanup process,
# so we unmount manually (ignore the exit code, the dirs may not be mounted).
from ..tools import log_call
log_call(['umount', os.path.join(info.root, 'sys')])
log_call(['umount', os.path.join(info.root, 'proc')])
raise
class IncludePackagesInBootstrap(Task): class IncludePackagesInBootstrap(Task):