From dbfe7b10d78d8a71ee404af0d3952af48eeb4d1d Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 18 Feb 2013 13:56:07 +0100 Subject: Removing incomplete support for fakeroot. --- scripts/build/chroot_proc | 41 ++++++++++++++--------------------------- 1 file changed, 14 insertions(+), 27 deletions(-) (limited to 'scripts/build/chroot_proc') 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 -- cgit v1.2.3