Merge trunk-r3965

This commit is contained in:
Pierre Labastie 2017-06-11 10:55:12 +00:00
parent b9f1fcf1ad
commit b37d5e3f0a

View file

@ -1127,23 +1127,24 @@ create-sbu_du-report: mk_SYSTOOLS
@touch \$@ @touch \$@
do-housekeeping: do-housekeeping:
@-umount \$(MOUNT_PT)/dev/pts @-umount \$(MOUNT_PT)/sys
@-if [ -h \$(MOUNT_PT)/dev/shm ]; then \\ @-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); \\ link=\$\$(readlink \$(MOUNT_PT)/dev/shm); \\
umount \$(MOUNT_PT)/\$\$link; \\ umount \$(MOUNT_PT)/\$\$link; \\
unset link; \\ unset link; \\
else \\ else \\
umount \$(MOUNT_PT)/dev/shm; \\ umount \$(MOUNT_PT)/dev/shm; \\
fi fi
@-umount \$(MOUNT_PT)/dev/pts
@-umount \$(MOUNT_PT)/dev @-umount \$(MOUNT_PT)/dev
@-umount \$(MOUNT_PT)/sys
@-umount \$(MOUNT_PT)/proc
@-rm /tools /cross-tools @-rm /tools /cross-tools
@-if [ ! -f luser-exist ]; then \\ @-if [ ! -f luser-exist ]; then \\
userdel \$(LUSER); \\ userdel \$(LUSER); \\
rm -rf \$(LUSER_HOME); \\ rm -rf \$(LUSER_HOME); \\
fi; fi;
EOF EOF
) >> $MKFILE ) >> $MKFILE