Changeset 72f2f82

Timestamp:

12/30/2012 04:30:44 PM (11 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

2.4, ablfs-more, legacy, new_features, trunk

Children:

57ec895

Parents:

21cab34

Message:

Cleanly umount the kernel files, following the new way of mounting /dev/shm

File:

• LFS/master.sh (modified) (2 diffs)

LFS/master.sh

@@ -513 +513 @@
         sudo mount -v --bind /dev \$(LFS)/dev
         sudo mount -vt devpts devpts \$(LFS)/dev/pts
-        sudo mount -vt tmpfs shm \$(LFS)/dev/shm
         sudo mount -vt proc proc \$(LFS)/proc
         sudo mount -vt sysfs sysfs \$(LFS)/sys
+        if [ -h \$(LFS)/dev/shm ]; then \\
+          link=\$\$(readlink \$(LFS)/dev/shm); \\
+          sudo mkdir -p \$(LFS)/\$\$link; \\
+          sudo mount -vt tmpfs shm \$(LFS)/\$\$link; \\
+          unset link; \\
+        else \\
+          sudo mount -vt tmpfs shm \$(LFS)/dev/shm; \\
+        fi
 
 teardown: ck_LFS
         sudo umount -v \$(LFS)/sys
         sudo umount -v \$(LFS)/proc
-        sudo umount -v \$(LFS)/dev/shm
         sudo umount -v \$(LFS)/dev/pts
+        if [ -h \$(LFS)/dev/shm ]; then \\
+          link=\$\$(readlink \$(LFS)/dev/shm); \\
+          sudo umount -v \$(LFS)/\$\$link; \\
+          unset link; \\
+        else \\
+          sudo umount -v \$(LFS)/dev/shm; \\
+        fi
         sudo umount -v \$(LFS)/dev
 
@@ -562 +575 @@
         @-umount \$(MOUNT_PT)/sys
         @-umount \$(MOUNT_PT)/proc
-        @-umount \$(MOUNT_PT)/dev/shm
+        @-if [ -h \$(MOUNT_PT)/dev/shm ]; then \\
+          link=\$\$(readlink \$(MOUNT_PT)/dev/shm); \\
+          umount \$(MOUNT_PT)/\$\$link; \\
+          unset link; \\
+        else \\
+          umount \$(MOUNT_PT)/dev/shm; \\
+        fi
         @-umount \$(MOUNT_PT)/dev/pts
         @-umount \$(MOUNT_PT)/dev