x-move/iconograph
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Unmount /proc before squashing

Browse Source
This commit is contained in:
Ian Gulliver
2016-04-08 23:33:42 +00:00
parent 3b8b1cc11e
commit fd656ab7f1
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
server/build_image.py
View File

@@ -116,8 +116,8 @@ class ImageBuilder(object):
self._umount.append(root) self._umount.append(root)
return root return root
def _MountProc(self, root): def _MountProc(self, chroot_path):
path = os.path.join(root, 'proc') path = os.path.join(chroot_path, 'proc')
self._Exec( self._Exec(
'mount', 'mount',
'--types', 'proc', '--types', 'proc',
@@ -245,6 +245,12 @@ class ImageBuilder(object):
source) source)
os.unlink(os.path.join(chroot_path, 'usr', 'sbin', 'policy-rc.d')) os.unlink(os.path.join(chroot_path, 'usr', 'sbin', 'policy-rc.d'))
def _Unmount(self, path):
self._Exec(
'umount',
path)
self._umount.remove(path)
def _Squash(self, chroot_path, union_path): def _Squash(self, chroot_path, union_path):
self._Exec( self._Exec(
'mksquashfs', 'mksquashfs',
@@ -273,7 +279,7 @@ class ImageBuilder(object):
chroot_path = self._Debootstrap(root) chroot_path = self._Debootstrap(root)
union_path = self._CreateUnion(root) union_path = self._CreateUnion(root)
self._MountProc(chroot_path) proc_path = self._MountProc(chroot_path)
self._FixSourcesList(chroot_path) self._FixSourcesList(chroot_path)
self._AddDiversions(chroot_path) self._AddDiversions(chroot_path)
self._InstallPackages(chroot_path) self._InstallPackages(chroot_path)
@@ -285,6 +291,7 @@ class ImageBuilder(object):
self._RemoveDiversions(chroot_path) self._RemoveDiversions(chroot_path)
if FLAGS.post_module_shell: if FLAGS.post_module_shell:
self._Exec('bash', cwd=root) self._Exec('bash', cwd=root)
self._Unmount(proc_path)
self._Squash(chroot_path, union_path) self._Squash(chroot_path, union_path)
self._CopyISOFiles(union_path) self._CopyISOFiles(union_path)
iso_path = self._CreateISO(union_path, timestamp) iso_path = self._CreateISO(union_path, timestamp)