diff options
| -rw-r--r-- | debian/changelog | 12 | ||||
| -rwxr-xr-x | debian/src/initscripts/etc/init.d/umountfs | 4 | ||||
| -rw-r--r-- | debian/src/initscripts/lib/init/bootclean.sh | 2 |
3 files changed, 15 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 07db0704..9b182c45 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +sysvinit (2.92~beta-2) unstable; urgency=medium + + [ Ben Hutchings ] + * Restore umount at shutdown of filesystems mounted before /usr + (Closes: #872039). Thanks to Elrond for this patch. + + [ Dmitry Bogaotv ] + * Fix typo in `/etc/init.d/bootclean.sh' (Closes: #914432) + + Thanks: Jörg-Volker Peetz <jvpeetz@web.de> + + -- Dmitry Bogatov <KAction@debian.org> Fri, 23 Nov 2018 16:45:40 +0000 + sysvinit (2.92~beta-1) unstable; urgency=medium [ Vincenzo (KatolaZ) Nicosia ] diff --git a/debian/src/initscripts/etc/init.d/umountfs b/debian/src/initscripts/etc/init.d/umountfs index 5f35b32b..70ce46c8 100755 --- a/debian/src/initscripts/etc/init.d/umountfs +++ b/debian/src/initscripts/etc/init.d/umountfs @@ -17,7 +17,7 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin umask 022 do_stop () { - PROTECTED_MOUNTS="$(sed -n ':a;/^[^ ]* \(\/\|\/usr\) /!{H;n;ba};{H;s/.*//;x;s/\n//;p}' /proc/mounts)" + PROTECTED_MOUNTS="$(sed -n ':a;/^[^ ]* \/ /!{H;n;ba};{H;s/.*//;x;s/\n//;p}' /proc/mounts)" WEAK_MTPTS="" # be gentle, don't use force REG_MTPTS="" TMPFS_MTPTS="" @@ -25,7 +25,7 @@ do_stop () { do echo "$PROTECTED_MOUNTS" | grep -qs "^$DEV $MTPT " && continue case "$MTPT" in - /|/proc|/dev|/.dev|/dev/pts|/dev/shm|/dev/.static/dev|/proc/*|/sys|/sys/*|/run|/run/*|/dev/vcs) + /|/usr|/proc|/dev|/.dev|/dev/pts|/dev/shm|/dev/.static/dev|/proc/*|/sys|/sys/*|/run|/run/*|/dev/vcs) continue ;; esac diff --git a/debian/src/initscripts/lib/init/bootclean.sh b/debian/src/initscripts/lib/init/bootclean.sh index 5eea1fe6..67e15a66 100644 --- a/debian/src/initscripts/lib/init/bootclean.sh +++ b/debian/src/initscripts/lib/init/bootclean.sh @@ -117,7 +117,7 @@ clean_tmp() { ! ( -path ./quota.group -uid 0 ) ! ( -path ./aquota.group -uid 0 ) ! ( -path ./.journal -uid 0 ) - ! ( -path ./.sujournal -uid 0) + ! ( -path ./.sujournal -uid 0 ) ! ( -path ./.clean -uid 0 ) ! ( -path './...security*' -uid 0 )' |