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_selinuxfs | |
| 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_selinuxfs')
| -rwxr-xr-x | scripts/build/chroot_selinuxfs | 32 |
1 files changed, 8 insertions, 24 deletions
diff --git a/scripts/build/chroot_selinuxfs b/scripts/build/chroot_selinuxfs index 23c2ae4e5..55b3e0ce1 100755 --- a/scripts/build/chroot_selinuxfs +++ b/scripts/build/chroot_selinuxfs @@ -45,17 +45,11 @@ case "${1}" in # Creating lock file Create_lockfile .lock - if [ "${LB_USE_FAKEROOT}" != "true" ] - then - # Create mountpoint - mkdir -p chroot/selinux - - # Mounting /selinux - mount selinuxfs-live -t selinuxfs chroot/selinux - else - rm -rf chroot/selinux - ln -s /selinux chroot/ - fi + # Create mountpoint + mkdir -p chroot/selinux + + # Mounting /selinux + mount selinuxfs-live -t selinuxfs chroot/selinux # Creating stage file Create_stagefile .build/chroot_selinuxfs @@ -71,20 +65,10 @@ case "${1}" in # Creating lock file Create_lockfile .lock - if [ "${LB_USE_FAKEROOT}" != "true" ] + # Unmounting /selinux + if [ -e chroot/selinux/enforce ] then - # Unmounting /selinux - #fuser -km chroot/selinux - if [ -e chroot/selinux/enforce ] - then - umount chroot/selinux - fi - else - if [ -e chroot/selinux ] - then - rm -rf chroot/selinux - mkdir -p chroot/selinux - fi + umount chroot/selinux fi # Removing stage file |