Author: pierre
Date: Sun Jun 11 03:55:12 2017
New Revision: 3966
Log:
Merge trunk-r3965
Modified:
jhalfs/branches/2.4/CLFS/master.sh
Modified: jhalfs/branches/2.4/CLFS/master.sh
==============================================================================
--- jhalfs/branches/2.4/CLFS/master.sh Sun Jun 11 03:49:40 2017 (r3965)
+++ jhalfs/branches/2.4/CLFS/master.sh Sun Jun 11 03:55:12 2017 (r3966)
@@ -1127,23 +1127,24 @@
@touch \$@
do-housekeeping:
- @-umount \$(MOUNT_PT)/dev/pts
- @-if [ -h \$(MOUNT_PT)/dev/shm ]; then \\
+ @-umount \$(MOUNT_PT)/sys
+ @-umount \$(MOUNT_PT)/proc
+ @-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; \\
unset link; \\
else \\
umount \$(MOUNT_PT)/dev/shm; \\
fi
+ @-umount \$(MOUNT_PT)/dev/pts
@-umount \$(MOUNT_PT)/dev
- @-umount \$(MOUNT_PT)/sys
- @-umount \$(MOUNT_PT)/proc
@-rm /tools /cross-tools
@-if [ ! -f luser-exist ]; then \\
userdel \$(LUSER); \\
rm -rf \$(LUSER_HOME); \\
fi;
-
EOF
) >> $MKFILE
--
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page
