[gentoo-commits] proj/releng:master commit in: tools-hardened/desktop/

[Devan Franchini]

commit:     ecc729aa55e0e4424daa20d6471b8cbcf305c99a
Author:     Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  9 20:35:17 2014 +0000
Commit:     Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Thu Oct  9 20:35:17 2014 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=ecc729aa

tools-hardened/desktop: Modifies un/mounting for run-base.sh

---
 tools-hardened/desktop/run-base.sh | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/tools-hardened/desktop/run-base.sh 
b/tools-hardened/desktop/run-base.sh
index 24326b3..89e9618 100755
--- a/tools-hardened/desktop/run-base.sh
+++ b/tools-hardened/desktop/run-base.sh
@@ -7,12 +7,10 @@ unpack_stage3() {
 
 mount_dirs() {
        mkdir "${ROOTFS}"/usr/portage/
-       mount --bind /usr/portage/ "${ROOTFS}"/usr/portage/
-       mount --bind /proc/ "${ROOTFS}"/proc/
-       mount --bind /dev/ "${ROOTFS}"/dev/
-       mount --bind /dev/pts "${ROOTFS}"/dev/pts/
-       mount -t tmpfs shm "${ROOTFS}"/dev/shm
-       mount --bind /sys/ "${ROOTFS}"/sys/
+       mount --rbind /usr/portage/ "${ROOTFS}"/usr/portage/
+       mount --rbind /proc/ "${ROOTFS}"/proc/
+       mount --rbind /dev/ "${ROOTFS}"/dev/
+       mount --rbind /sys/ "${ROOTFS}"/sys/
 }
 
 populate_kernel_src()
@@ -135,12 +133,10 @@ cleanup_dirs() {
 }
 
 unmount_dirs() {
-       umount "${ROOTFS}"/sys/
-       umount "${ROOTFS}"/dev/shm
-       umount "${ROOTFS}"/dev/pts/
-       umount "${ROOTFS}"/dev/
-       umount "${ROOTFS}"/proc/
-       umount "${ROOTFS}"/usr/portage/
+       umount -l "${ROOTFS}"/sys/
+       umount -l "${ROOTFS}"/dev/
+       umount -l "${ROOTFS}"/proc/
+       umount -l "${ROOTFS}"/usr/portage/
 
        mkdir "${ROOTFS}"/usr/portage/profiles/
        echo "gentoo" >> "${ROOTFS}"/usr/portage/profiles/repo_name