committing changes in /etc made by "apt-get upgrade"

author mhoellein <mario@hoellein.online>

Fri, 3 Sep 2021 10:38:33 +0000 (12:38 +0200)

committer mhoellein <mario@hoellein.online>

Fri, 3 Sep 2021 10:38:33 +0000 (12:38 +0200)
author mhoellein <mario@hoellein.online>
Fri, 3 Sep 2021 10:38:33 +0000 (12:38 +0200)
committer mhoellein <mario@hoellein.online>
Fri, 3 Sep 2021 10:38:33 +0000 (12:38 +0200)
diff --git a/.etckeeper b/.etckeeper

index 70095ba8f2681e1f56378e72f3d4ef8dfeda7892..70689b0bbc73ed27d5136758ffac2d5c17178efc 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -870,6 +870,7 @@ maybe chmod 0755 'kernel/install.d'
  maybe chmod 0755 'kernel/postinst.d'
  maybe chmod 0755 'kernel/postinst.d/apt-auto-removal'
  maybe chmod 0755 'kernel/postinst.d/initramfs-tools'
+maybe chmod 0755 'kernel/postinst.d/xx-update-initrd-links'
  maybe chmod 0755 'kernel/postinst.d/zz-update-grub'
  maybe chmod 0755 'kernel/postrm.d'
  maybe chmod 0755 'kernel/postrm.d/initramfs-tools'
@@ -1245,6 +1246,7 @@ maybe chmod 0755 'systemd/system/graphical.target.wants'
  maybe chmod 0755 'systemd/system/multi-user.target.wants'
  maybe chmod 0755 'systemd/system/paths.target.wants'
  maybe chmod 0664 'systemd/system/set-route-network.service'
+maybe chmod 0755 'systemd/system/sleep.target.wants'
  maybe chmod 0755 'systemd/system/sockets.target.wants'
  maybe chmod 0755 'systemd/system/sysinit.target.wants'
  maybe chmod 0755 'systemd/system/timers.target.wants'
diff --git a/dhcp/dhclient-enter-hooks.d/resolved b/dhcp/dhclient-enter-hooks.d/resolved

index e3c7ed7322959d0b84f3d7ae1721b568a1332d55..8e4f15006e785266d51c6ed5f5361c043ceec70e 100755 (executable)
--- a/dhcp/dhclient-enter-hooks.d/resolved
+++ b/dhcp/dhclient-enter-hooks.d/resolved
@@ -14,7 +14,7 @@
  #   (D) = master script downs interface
  #   (-) = master script does nothing with this
  
-if [ -x /lib/systemd/systemd-resolved ] ; then
+if systemctl is-enabled systemd-resolved > /dev/null 2>&1; then
          # For safety, first undefine the nasty default make_resolv_conf()
          make_resolv_conf() { : ; }
          case "$reason" in
diff --git a/grub.d/10_linux b/grub.d/10_linux

index 5a43f0c787b2337f2b4b9a8b07b9e10a72bffcad..a91bb2de35c9d3248c1c88bd3361bb53a3269a85 100755 (executable)
--- a/grub.d/10_linux
+++ b/grub.d/10_linux
@@ -160,6 +160,12 @@ if [ "$vt_handoff" = 1 ]; then
  fi
  
  if [ x"$GRUB_FORCE_PARTUUID" != x ]; then
+    gettext_printf "GRUB_FORCE_PARTUUID is set, will attempt initrdless boot\n" >&2
+    cat << EOF
+#
+# GRUB_FORCE_PARTUUID is set, will attempt initrdless boot
+# Upon panic fallback to booting with initrd
+EOF
     echo "set partuuid=${GRUB_FORCE_PARTUUID}"
  fi
  
@@ -245,6 +251,8 @@ EOF
          linux_root_device_thisversion="PARTUUID=${GRUB_FORCE_PARTUUID}"
      fi
      message="$(gettext_printf "Loading initial ramdisk ...")"
+    initrdlessfail_msg="$(gettext_printf "GRUB_FORCE_PARTUUID set, initrdless boot failed. Attempting with initrd.")"
+    initrdlesstry_msg="$(gettext_printf "GRUB_FORCE_PARTUUID set, attempting initrdless boot.")"
      initrd_path=
      for i in ${initrd}; do
          initrd_path="${initrd_path} ${rel_dirname}/${i}"
@@ -256,6 +264,7 @@ EOF
      if test -n "${initrd}" && [ x"$GRUB_FORCE_PARTUUID" != x ]; then
          sed "s/^/$submenu_indentation/" << EOF
         if [ "\${initrdfail}" = 1 ]; then
+         echo  '$(echo "$initrdlessfail_msg" | grub_quote)'
           linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
  EOF
          if [ x"$quiet_boot" = x0 ] || [ x"$type" != xsimple ]; then
@@ -266,6 +275,7 @@ EOF
          sed "s/^/$submenu_indentation/" << EOF
           initrd        $(echo $initrd_path)
         else
+         echo  '$(echo "$initrdlesstry_msg" | grub_quote)'
           linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} panic=-1
  EOF
          if [ -n "$initrd_path_only_early" ]; then
diff --git a/issue b/issue

index 325e20c5b67a8faa22c7ba01ed22c09af273c0a6..356d87ff08ad4c437dcad2d63bfa2bda2e6fc260 100644 (file)
--- a/issue
+++ b/issue
@@ -1,2 +1,2 @@
-Ubuntu 20.04.2 LTS \n \l
+Ubuntu 20.04.3 LTS \n \l
  
diff --git a/issue.net b/issue.net

index 05040bf9809ae8d32ef62615360af07979bb8743..55bc29ea08fa5775a8326fbf8619331a37e0387c 100644 (file)
--- a/issue.net
+++ b/issue.net
@@ -1 +1 @@
-Ubuntu 20.04.2 LTS
+Ubuntu 20.04.3 LTS
diff --git a/kernel/postinst.d/xx-update-initrd-links b/kernel/postinst.d/xx-update-initrd-links

new file mode 100755 (executable)

index 0000000..51f2a39
--- /dev/null
+++ b/kernel/postinst.d/xx-update-initrd-links
@@ -0,0 +1,24 @@
+#!/bin/sh
+set -e
+
+# installkernel script calls postinst.d without any DEB_MAINT_PARAMS set
+# linux-image-* postinst calls postinst.d with DEB_MAINT_PARAMS set
+# do nothing in case linux-image-* calls this, as it already calls `linux-update-symlinks`
+[ -z "$DEB_MAINT_PARAMS" ] || exit 0
+
+# installkernel must call postinst.d with two args, version & image_path
+version="$1"
+image_path="$2"
+
+[ -n "$version" ] || exit 0
+[ -n "$image_path" ] || exit 0
+
+# call linux-update-symlinks in install mode, which will correctly
+# update vmlinuz & initrd.img symlinks. Even if initrd.img does not
+# exist yet, or has already been created by the initramfs-update
+# postinst.d hook. It will also honor kernel_img.conf settings to
+# link_in_boot yes/no. Thus matching behaviour of linux-image-*
+# postinst call to linux-update-symlinks.
+linux-update-symlinks install $version $image_path
+
+exit 0
diff --git a/lsb-release b/lsb-release

index 92804683fbdba31ad57c9aa3c08b5864b969a4b0..53e846156fcc33e1112f3be50f16cedbb8e5da02 100644 (file)
--- a/lsb-release
+++ b/lsb-release
@@ -1,4 +1,4 @@
  DISTRIB_ID=Ubuntu
  DISTRIB_RELEASE=20.04
  DISTRIB_CODENAME=focal
-DISTRIB_DESCRIPTION="Ubuntu 20.04.2 LTS"
+DISTRIB_DESCRIPTION="Ubuntu 20.04.3 LTS"
diff --git a/systemd/system/multi-user.target.wants/grub-common.service b/systemd/system/multi-user.target.wants/grub-common.service

new file mode 120000 (symlink)

index 0000000..c0ca745
--- /dev/null
+++ b/systemd/system/multi-user.target.wants/grub-common.service
@@ -0,0 +1 @@
+/lib/systemd/system/grub-common.service
+\ No newline at end of file
diff --git a/systemd/system/sleep.target.wants/grub-common.service b/systemd/system/sleep.target.wants/grub-common.service

new file mode 120000 (symlink)

index 0000000..c0ca745
--- /dev/null
+++ b/systemd/system/sleep.target.wants/grub-common.service
@@ -0,0 +1 @@
+/lib/systemd/system/grub-common.service
+\ No newline at end of file
author	mhoellein <mario@hoellein.online>
	Fri, 3 Sep 2021 10:38:33 +0000 (12:38 +0200)
committer	mhoellein <mario@hoellein.online>
	Fri, 3 Sep 2021 10:38:33 +0000 (12:38 +0200)
.etckeeper		patch \| blob \| history
dhcp/dhclient-enter-hooks.d/resolved		patch \| blob \| history
grub.d/10_linux		patch \| blob \| history
issue		patch \| blob \| history
issue.net		patch \| blob \| history
kernel/postinst.d/xx-update-initrd-links	[new file with mode: 0755]	patch \| blob
lsb-release		patch \| blob \| history
systemd/system/multi-user.target.wants/grub-common.service	[new symlink]	patch \| blob
systemd/system/sleep.target.wants/grub-common.service	[new symlink]	patch \| blob