diff options
| author | Daniel Baumann <daniel@debian.org> | 2013-02-18 13:56:07 +0100 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2013-05-06 14:50:06 +0200 |
| commit | dbfe7b10d78d8a71ee404af0d3952af48eeb4d1d (patch) | |
| tree | 709a2c9331091622e6b96bb22b52410d0109ccb1 /scripts/build/chroot_proc | |
| parent | 04cec317cc4437eed514f4277f6779010e587662 (diff) | |
| download | vyos-live-build-dbfe7b10d78d8a71ee404af0d3952af48eeb4d1d.tar.gz vyos-live-build-dbfe7b10d78d8a71ee404af0d3952af48eeb4d1d.zip | |
Removing incomplete support for fakeroot.
Diffstat (limited to 'scripts/build/chroot_proc')
| -rwxr-xr-x | scripts/build/chroot_proc | 41 |
1 files changed, 14 insertions, 27 deletions
diff --git a/scripts/build/chroot_proc b/scripts/build/chroot_proc index 99dd81178..ba564e3fb 100755 --- a/scripts/build/chroot_proc +++ b/scripts/build/chroot_proc @@ -43,17 +43,11 @@ case "${1}" in # Creating lock file Create_lockfile .lock - if [ "${LB_USE_FAKEROOT}" != "true" ] - then - # Creating mountpoint - mkdir -p chroot/proc - - # Mounting /proc - mount proc-live -t proc chroot/proc - else - rm -rf chroot/proc - ln -s /proc chroot/ - fi + # Creating mountpoint + mkdir -p chroot/proc + + # Mounting /proc + mount proc-live -t proc chroot/proc # Creating stage file Create_stagefile .build/chroot_proc @@ -68,23 +62,16 @@ case "${1}" in # Creating lock file Create_lockfile .lock - if [ "${LB_USE_FAKEROOT}" != "true" ] + # Workaround binfmt-support /proc locking + if [ -e chroot/proc/sys/fs/binfmt_misc/status ] + then + umount chroot/proc/sys/fs/binfmt_misc + fi + + # Unmounting /proc + if [ -e chroot/proc/version ] then - # Workaround binfmt-support /proc locking - if [ -e chroot/proc/sys/fs/binfmt_misc/status ] - then - umount chroot/proc/sys/fs/binfmt_misc - fi - - # Unmounting /proc - #fuser -km chroot/proc - if [ -e chroot/proc/version ] - then - umount chroot/proc - fi - else - rm -rf chroot/proc - mkdir -p chroot/proc + umount chroot/proc fi # Removing stage file |