committing changes in /etc after apt run

Package changes:
-bind9-host 1:9.10.3.dfsg.P4-11 amd64
-bind9utils 1:9.10.3.dfsg.P4-11 amd64
+bind9-host 1:9.10.3.dfsg.P4-11.1 amd64
+bind9utils 1:9.10.3.dfsg.P4-11.1 amd64
-console-setup 1.158 all
-console-setup-linux 1.158 all
+console-setup 1.160 all
+console-setup-linux 1.160 all
-dbus 1.10.14-1 amd64
+dbus 1.10.16-1 amd64
-dh-strip-nondeterminism 0.029-2 all
+dh-strip-nondeterminism 0.031-1 all
-dnsutils 1:9.10.3.dfsg.P4-11 amd64
+dnsutils 1:9.10.3.dfsg.P4-11.1 amd64
-findutils 4.6.0+git+20161106-1 amd64
+findutils 4.6.0+git+20161106-2 amd64
-grub-common 2.02~beta3-4 amd64
-grub-pc 2.02~beta3-4 amd64
-grub-pc-bin 2.02~beta3-4 amd64
-grub2-common 2.02~beta3-4 amd64
+grub-common 2.02~beta3-5 amd64
+grub-pc 2.02~beta3-5 amd64
+grub-pc-bin 2.02~beta3-5 amd64
+grub2-common 2.02~beta3-5 amd64
-initscripts 2.88dsf-59.8 amd64
+initscripts 2.88dsf-59.9 amd64
-keyboard-configuration 1.158 all
+keyboard-configuration 1.160 all
-libbind9-140 1:9.10.3.dfsg.P4-11 amd64
+libbind9-140 1:9.10.3.dfsg.P4-11.1 amd64
-libdbus-1-3 1.10.14-1 amd64
+libdbus-1-3 1.10.16-1 amd64
-libdns-export162 1:9.10.3.dfsg.P4-11 amd64
-libdns162 1:9.10.3.dfsg.P4-11 amd64
+libdns-export162 1:9.10.3.dfsg.P4-11.1 amd64
+libdns162 1:9.10.3.dfsg.P4-11.1 amd64
-libevent-2.0-5 2.0.21-stable-2.1 amd64
+libevent-2.0-5 2.0.21-stable-3 amd64
-libfile-stripnondeterminism-perl 0.029-2 all
+libfile-stripnondeterminism-perl 0.031-1 all
-libisc-export160 1:9.10.3.dfsg.P4-11 amd64
-libisc160 1:9.10.3.dfsg.P4-11 amd64
-libisccc140 1:9.10.3.dfsg.P4-11 amd64
-libisccfg140 1:9.10.3.dfsg.P4-11 amd64
+libisc-export160 1:9.10.3.dfsg.P4-11.1 amd64
+libisc160 1:9.10.3.dfsg.P4-11.1 amd64
+libisccc140 1:9.10.3.dfsg.P4-11.1 amd64
+libisccfg140 1:9.10.3.dfsg.P4-11.1 amd64
-liblwres141 1:9.10.3.dfsg.P4-11 amd64
+liblwres141 1:9.10.3.dfsg.P4-11.1 amd64
-libssl1.1 1.1.0d-2 amd64
+libssl1.1 1.1.0e-1 amd64
-make 4.1-9 amd64
+make 4.1-9.1 amd64
-openssl 1.1.0d-2 amd64
+openssl 1.1.0e-1 amd64
-python3-reportbug 7.1.4 all
+python3-reportbug 7.1.5 all
-reportbug 7.1.4 all
+reportbug 7.1.5 all
-sysv-rc 2.88dsf-59.8 all
-sysvinit-utils 2.88dsf-59.8 amd64
+sysv-rc 2.88dsf-59.9 all
+sysvinit-utils 2.88dsf-59.9 amd64
-tcpdump 4.9.0-1 amd64
+tcpdump 4.9.0-2 amd64

diff --git a/init.d/umountfs b/init.d/umountfs
index d2d43aed9361060380cc17adf3ad3e5e02c8c97d..5f35b32b0bcc83b9c3b6545d94b705dfad764c5a 100755 (executable)
--- a/init.d/umountfs
+++ b/init.d/umountfs
@@ -17,7 +17,7 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin
 umask 022
 
 do_stop () {
-       PROTECTED_MOUNTS="$(sed -n ':a;/^[^ ]* \/ /!{H;n;ba};{H;s/.*//;x;s/\n//;p}' /proc/mounts)"
+       PROTECTED_MOUNTS="$(sed -n ':a;/^[^ ]* \(\/\|\/usr\) /!{H;n;ba};{H;s/.*//;x;s/\n//;p}' /proc/mounts)"
        WEAK_MTPTS="" # be gentle, don't use force
        REG_MTPTS=""
        TMPFS_MTPTS=""

diff --git a/init.d/umountroot b/init.d/umountroot
index 451fbea81150754559e948a835162ea83a65a6de..8b4c5bd120d069492f72ca889a809fd4c98db86a 100755 (executable)
--- a/init.d/umountroot
+++ b/init.d/umountroot
@@ -6,7 +6,7 @@
 # Should-Stop:       halt reboot kexec
 # Default-Start:
 # Default-Stop:      0 6
-# Short-Description: Mount the root filesystem read-only.
+# Short-Description: Mount the root and /usr filesystems read-only.
 ### END INIT INFO
 
 PATH=/sbin:/bin
@@ -14,21 +14,28 @@ PATH=/sbin:/bin
 
 . /lib/lsb/init-functions
 
-do_stop () {
-       [ "$VERBOSE" = no ] || log_action_begin_msg "Mounting root filesystem read-only"
+remount_ro () {
+       [ "$VERBOSE" = no ] || log_action_begin_msg "Mounting $1 filesystem read-only"
        MOUNT_FORCE_OPT=
        [ "$(uname -s)" = "GNU/kFreeBSD" ] && MOUNT_FORCE_OPT=-f
        # This:
        #     mount -n -o remount,ro /
        # will act on a bind mount of / if there is one.
        # See #339023 and the comment in checkroot.sh
-       mount    $MOUNT_FORCE_OPT -n -o remount,ro -t dummytype dummydev / 2>/dev/null \
-       || mount $MOUNT_FORCE_OPT -n -o remount,ro              dummydev / 2>/dev/null \
-       || mount $MOUNT_FORCE_OPT -n -o remount,ro                       /
+       mount    $MOUNT_FORCE_OPT -n -o remount,ro -t dummytype dummydev $2 2>/dev/null \
+       || mount $MOUNT_FORCE_OPT -n -o remount,ro              dummydev $2 2>/dev/null \
+       || mount $MOUNT_FORCE_OPT -n -o remount,ro                       $2
        ES=$?
        [ "$VERBOSE" = no ] || log_action_end_msg $ES
 }
 
+do_stop () {
+       remount_ro root /
+       if mountpoint -q /usr; then
+               remount_ro /usr /usr
+       fi
+}
+
 case "$1" in
   start|status)
        # No-op