committing changes in /etc after apt run

Package changes:
-apt 1.6.6ubuntu0.1 amd64
+apt 1.6.8 amd64
-apt-utils 1.6.6ubuntu0.1 amd64
+apt-utils 1.6.8 amd64
-avahi-autoipd 0.7-3.1ubuntu1.1 amd64
-avahi-daemon 0.7-3.1ubuntu1.1 amd64
-avahi-utils 0.7-3.1ubuntu1.1 amd64
+avahi-autoipd 0.7-3.1ubuntu1.2 amd64
+avahi-daemon 0.7-3.1ubuntu1.2 amd64
+avahi-utils 0.7-3.1ubuntu1.2 amd64
-firefox 64.0+linuxmint2+tessa amd64
-firefox-locale-de 64.0+linuxmint2+tessa amd64
-firefox-locale-en 64.0+linuxmint2+tessa amd64
+firefox 65.0+linuxmint1+tessa amd64
+firefox-locale-de 65.0+linuxmint1+tessa amd64
+firefox-locale-en 65.0+linuxmint1+tessa amd64
-grub-common 2.02-2ubuntu8.9 amd64
+grub-common 2.02-2ubuntu8.10 amd64
-grub-pc 2.02-2ubuntu8.9 amd64
-grub-pc-bin 2.02-2ubuntu8.9 amd64
-grub2-common 2.02-2ubuntu8.9 amd64
+grub-pc 2.02-2ubuntu8.10 amd64
+grub-pc-bin 2.02-2ubuntu8.10 amd64
+grub2-common 2.02-2ubuntu8.10 amd64
-libapt-inst2.0 1.6.6ubuntu0.1 amd64
+libapt-inst2.0 1.6.8 amd64
-libapt-pkg5.0 1.6.6ubuntu0.1 amd64
+libapt-pkg5.0 1.6.8 amd64
-libavahi-client3 0.7-3.1ubuntu1.1 amd64
-libavahi-common-data 0.7-3.1ubuntu1.1 amd64
-libavahi-common3 0.7-3.1ubuntu1.1 amd64
-libavahi-core7 0.7-3.1ubuntu1.1 amd64
-libavahi-glib1 0.7-3.1ubuntu1.1 amd64
+libavahi-client3 0.7-3.1ubuntu1.2 amd64
+libavahi-common-data 0.7-3.1ubuntu1.2 amd64
+libavahi-common3 0.7-3.1ubuntu1.2 amd64
+libavahi-core7 0.7-3.1ubuntu1.2 amd64
+libavahi-glib1 0.7-3.1ubuntu1.2 amd64
-linux-generic 4.15.0.44.46 amd64
+linux-generic 4.15.0.45.47 amd64
-linux-headers-generic 4.15.0.44.46 amd64
+linux-headers-4.15.0-45 4.15.0-45.48 all
+linux-headers-4.15.0-45-generic 4.15.0-45.48 amd64
+linux-headers-generic 4.15.0.45.47 amd64
-linux-image-generic 4.15.0.44.46 amd64
+linux-image-4.15.0-45-generic 4.15.0-45.48 amd64
+linux-image-generic 4.15.0.45.47 amd64
-linux-libc-dev 4.15.0-44.47 amd64
+linux-libc-dev 4.15.0-45.48 amd64
+linux-modules-4.15.0-45-generic 4.15.0-45.48 amd64
+linux-modules-extra-4.15.0-45-generic 4.15.0-45.48 amd64
-python3-distupgrade 1:18.04.29 all
+python3-distupgrade 1:18.04.30 all
-python3-update-manager 1:18.04.11.8 all
+python3-update-manager 1:18.04.11.9 all
-ubuntu-release-upgrader-core 1:18.04.29 all
+ubuntu-release-upgrader-core 1:18.04.30 all
-update-manager-core 1:18.04.11.8 all
+update-manager-core 1:18.04.11.9 all

diff --git a/apt/apt.conf.d/01autoremove b/apt/apt.conf.d/01autoremove
index 6c6767bb910130c9198c21e779549fc64d2a2458..f7775b183183ea5cc07e24d4ed7210241e3ada65 100644 (file)
--- a/apt/apt.conf.d/01autoremove
+++ b/apt/apt.conf.d/01autoremove
@@ -4,6 +4,8 @@ APT
   {
        "^firmware-linux.*";
        "^linux-firmware$";
+       "^linux-image-[a-z0-9]*$";
+       "^linux-image-[a-z0-9]*-[a-z0-9]*$";
   };
 
   VersionedKernelPackages

diff --git a/apt/apt.conf.d/01autoremove-kernels b/apt/apt.conf.d/01autoremove-kernels
index 0da4c125e51b45592e009251dc5b429ded81dd5c..baf162eca711c107960477316ea63ba5ba5ce62c 100644 (file)
--- a/apt/apt.conf.d/01autoremove-kernels
+++ b/apt/apt.conf.d/01autoremove-kernels
@@ -1,65 +1,65 @@
 // DO NOT EDIT! File autogenerated by /etc/kernel/postinst.d/apt-auto-removal
 APT::NeverAutoRemove
 {
-   "^linux-image-4\.15\.0-43-generic$";
    "^linux-image-4\.15\.0-44-generic$";
-   "^linux-headers-4\.15\.0-43-generic$";
+   "^linux-image-4\.15\.0-45-generic$";
    "^linux-headers-4\.15\.0-44-generic$";
-   "^linux-image-extra-4\.15\.0-43-generic$";
+   "^linux-headers-4\.15\.0-45-generic$";
    "^linux-image-extra-4\.15\.0-44-generic$";
-   "^linux-modules-4\.15\.0-43-generic$";
+   "^linux-image-extra-4\.15\.0-45-generic$";
    "^linux-modules-4\.15\.0-44-generic$";
-   "^linux-modules-extra-4\.15\.0-43-generic$";
+   "^linux-modules-4\.15\.0-45-generic$";
    "^linux-modules-extra-4\.15\.0-44-generic$";
-   "^linux-signed-image-4\.15\.0-43-generic$";
+   "^linux-modules-extra-4\.15\.0-45-generic$";
    "^linux-signed-image-4\.15\.0-44-generic$";
-   "^kfreebsd-image-4\.15\.0-43-generic$";
+   "^linux-signed-image-4\.15\.0-45-generic$";
    "^kfreebsd-image-4\.15\.0-44-generic$";
-   "^kfreebsd-headers-4\.15\.0-43-generic$";
+   "^kfreebsd-image-4\.15\.0-45-generic$";
    "^kfreebsd-headers-4\.15\.0-44-generic$";
-   "^gnumach-image-4\.15\.0-43-generic$";
+   "^kfreebsd-headers-4\.15\.0-45-generic$";
    "^gnumach-image-4\.15\.0-44-generic$";
-   "^.*-modules-4\.15\.0-43-generic$";
+   "^gnumach-image-4\.15\.0-45-generic$";
    "^.*-modules-4\.15\.0-44-generic$";
-   "^.*-kernel-4\.15\.0-43-generic$";
+   "^.*-modules-4\.15\.0-45-generic$";
    "^.*-kernel-4\.15\.0-44-generic$";
-   "^linux-backports-modules-.*-4\.15\.0-43-generic$";
+   "^.*-kernel-4\.15\.0-45-generic$";
    "^linux-backports-modules-.*-4\.15\.0-44-generic$";
-   "^linux-modules-.*-4\.15\.0-43-generic$";
+   "^linux-backports-modules-.*-4\.15\.0-45-generic$";
    "^linux-modules-.*-4\.15\.0-44-generic$";
-   "^linux-tools-4\.15\.0-43-generic$";
+   "^linux-modules-.*-4\.15\.0-45-generic$";
    "^linux-tools-4\.15\.0-44-generic$";
-   "^linux-cloud-tools-4\.15\.0-43-generic$";
+   "^linux-tools-4\.15\.0-45-generic$";
    "^linux-cloud-tools-4\.15\.0-44-generic$";
+   "^linux-cloud-tools-4\.15\.0-45-generic$";
 };
 /* Debug information:
 # dpkg list:
 ii  linux-image-4.15.0-20-generic              4.15.0-20.21                           amd64        Signed kernel image generic
 ii  linux-image-4.15.0-24-generic              4.15.0-24.26                           amd64        Signed kernel image generic
-ii  linux-image-4.15.0-42-generic              4.15.0-42.45                           amd64        Signed kernel image generic
 ii  linux-image-4.15.0-43-generic              4.15.0-43.46                           amd64        Signed kernel image generic
-iF  linux-image-4.15.0-44-generic              4.15.0-44.47                           amd64        Signed kernel image generic
-ii  linux-image-generic                        4.15.0.44.46                           amd64        Generic Linux kernel image
+ii  linux-image-4.15.0-44-generic              4.15.0-44.47                           amd64        Signed kernel image generic
+iF  linux-image-4.15.0-45-generic              4.15.0-45.48                           amd64        Signed kernel image generic
+ii  linux-image-generic                        4.15.0.45.47                           amd64        Generic Linux kernel image
 # list of installed kernel packages:
 4.15.0-20-generic 4.15.0-20.21
 4.15.0-24-generic 4.15.0-24.26
-4.15.0-42-generic 4.15.0-42.45
 4.15.0-43-generic 4.15.0-43.46
 4.15.0-44-generic 4.15.0-44.47
+4.15.0-45-generic 4.15.0-45.48
 # list of different kernel versions:
+4.15.0-45.48
 4.15.0-44.47
 4.15.0-43.46
-4.15.0-42.45
 4.15.0-24.26
 4.15.0-20.21
-# Installing kernel: 4.15.0-44.47 (4.15.0-44-generic)
-# Running kernel: 4.15.0-43.46 (4.15.0-43-generic)
-# Last kernel: 4.15.0-44.47
-# Previous kernel: 4.15.0-43.46
+# Installing kernel: 4.15.0-45.48 (4.15.0-45-generic)
+# Running kernel: 4.15.0-44.47 (4.15.0-44-generic)
+# Last kernel: 4.15.0-45.48
+# Previous kernel: 4.15.0-44.47
 # Kernel versions list to keep:
-4.15.0-43.46
 4.15.0-44.47
+4.15.0-45.48
 # Kernel packages (version part) to protect:
-4\.15\.0-43-generic
 4\.15\.0-44-generic
+4\.15\.0-45-generic
 */

diff --git a/grub.d/00_header b/grub.d/00_header
index 52ca719298dc20d3f397ea3b19a71a36a18e30e3..ed302b6b58c50a9573691beb977434430da5c6be 100755 (executable)
--- a/grub.d/00_header
+++ b/grub.d/00_header
@@ -115,7 +115,7 @@ EOF
           cat <<EOF
   # GRUB lacks write support for $abstraction, so recordfail support is disabled.
 EOF
-          return
+          return 1
           ;;
       esac
     done
@@ -126,7 +126,7 @@ EOF
        cat <<EOF
   # GRUB lacks write support for $FS, so recordfail support is disabled.
 EOF
-       return
+       return 1
        ;;
     esac
 
@@ -135,7 +135,9 @@ EOF
 EOF
   }
 
-  check_writable
+  if ! check_writable; then
+    recordfail_broken=1
+  fi
 
   cat <<EOF
 }
@@ -379,6 +381,16 @@ EOF
   fi
 fi
 EOF
+if [ "$recordfail_broken" = 1 ]; then
+  cat << EOF
+if lsefi; then
+  set timeout=${GRUB_RECORDFAIL_TIMEOUT:-30}
+  if [ x\$feature_timeout_style = xy ] ; then
+    set timeout_style=menu
+  fi
+fi
+EOF
+fi
 }
 
 if [ "x$GRUB_BUTTON_CMOS_ADDRESS" != "x" ]; then

diff --git a/update-manager/release-upgrades b/update-manager/release-upgrades
index 94d2fae55ef91d8af09b77609a2ce8f08f12cda0..e511ab72679b29e70d13d11e4e8938e7793287a7 100644 (file)
--- a/update-manager/release-upgrades
+++ b/update-manager/release-upgrades
@@ -3,15 +3,14 @@
 [DEFAULT]
 # Default prompting behavior, valid options:
 #
-#  never  - Never check for a new release.
+#  never  - Never check for, or allow upgrading to, a new release.
 #  normal - Check to see if a new release is available.  If more than one new
 #           release is found, the release upgrader will attempt to upgrade to
-#           the release that immediately succeeds the currently-running
-#           release.
+#           the supported release that immediately succeeds the
+#           currently-running release.
 #  lts    - Check to see if a new LTS release is available.  The upgrader
 #           will attempt to upgrade to the first LTS release available after
-#           the currently-running one.  Note that this option should not be
-#           used if the currently-running release is not itself an LTS
-#           release, since in that case the upgrader won't be able to
-#           determine if a newer release is available.
+#           the currently-running one.  Note that if this option is used and
+#           the currently-running release is not itself an LTS release the
+#           upgrader will assume prompt was meant to be normal.
 Prompt=lts