Changeset d954e9c for LFS

Timestamp:

01/23/2014 09:15:05 AM (10 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

2.4, ablfs-more, legacy, new_features, trunk

Children:

8fe6462

Parents:

2270ffd

Message:

Adapt the umounting of kernel virtual filesystems to new instructions
in the LFS book

File:

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

LFS/master.sh

@@ -521 +521 @@
         sudo mount -vt proc proc \$(MOUNT_PT)/proc
         sudo mount -vt sysfs sysfs \$(MOUNT_PT)/sys
+        sudo mount -vt tmpfs tmpfs \$(MOUNT_PT)/run
         if [ -h \$(MOUNT_PT)/dev/shm ]; then \\
-          link=\$\$(readlink \$(MOUNT_PT)/dev/shm); \\
-          sudo mkdir -p \$(MOUNT_PT)/\$\$link; \\
-          sudo mount -vt tmpfs shm \$(MOUNT_PT)/\$\$link; \\
-          unset link; \\
-        else \\
-          sudo mount -vt tmpfs shm \$(MOUNT_PT)/dev/shm; \\
+          sudo mkdir -p \$(MOUNT_PT)/\$\$(readlink \$(MOUNT_PT)/dev/shm); \\
         fi
 
@@ -534 +530 @@
         sudo umount -v \$(MOUNT_PT)/proc
         sudo umount -v \$(MOUNT_PT)/dev/pts
-        if [ -h \$(MOUNT_PT)/dev/shm ]; then \\
+        if mountpoint -q \$(MOUNT_POINT)/run; then \\
+          sudo umount -v \$(MOUNT_POINT)/run; \\
+        elif [ -h \$(MOUNT_PT)/dev/shm ]; then \\
           link=\$\$(readlink \$(MOUNT_PT)/dev/shm); \\
           sudo umount -v \$(MOUNT_PT)/\$\$link; \\
@@ -578 +576 @@
         @-umount \$(MOUNT_PT)/sys
         @-umount \$(MOUNT_PT)/proc
-        @-if [ -h \$(MOUNT_PT)/dev/shm ]; then \\
+        @-if mountpoint -q \$(MOUNT_PT)/run; then \\
+          umount \$(MOUNT_PT)/run; \\
+        elif [ -h \$(MOUNT_PT)/dev/shm ]; then \\
           link=\$\$(readlink \$(MOUNT_PT)/dev/shm); \\
           umount \$(MOUNT_PT)/\$\$link; \\