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

Package changes:
-alsa-ucm-conf 1.2.2-1ubuntu0.1 all
+alsa-ucm-conf 1.2.2-1ubuntu0.2 all
-grub-common 2.04-1ubuntu26.2 amd64
+grub-common 2.04-1ubuntu26.3 amd64
-grub-pc 2.04-1ubuntu26.2 amd64
-grub-pc-bin 2.04-1ubuntu26.2 amd64
-grub2-common 2.04-1ubuntu26.2 amd64
+grub-pc 2.04-1ubuntu26.3 amd64
+grub-pc-bin 2.04-1ubuntu26.3 amd64
+grub2-common 2.04-1ubuntu26.3 amd64
-libasound2 1.2.2-2.1ubuntu1 amd64
-libasound2-data 1.2.2-2.1ubuntu1 all
+libasound2 1.2.2-2.1ubuntu2 amd64
+libasound2-data 1.2.2-2.1ubuntu2 all
-libpam-modules 1.3.1-5ubuntu4 amd64
-libpam-modules-bin 1.3.1-5ubuntu4 amd64
-libpam-runtime 1.3.1-5ubuntu4 all
+libpam-modules 1.3.1-5ubuntu4.1 amd64
+libpam-modules-bin 1.3.1-5ubuntu4.1 amd64
+libpam-runtime 1.3.1-5ubuntu4.1 all
-libpam0g 1.3.1-5ubuntu4 amd64
+libpam0g 1.3.1-5ubuntu4.1 amd64
-linux-firmware 1.187.2 all
+linux-firmware 1.187.3 all
-linux-libc-dev 5.4.0-42.46 amd64
+linux-libc-dev 5.4.0-45.49 amd64

diff --git a/environment b/environment
index 048769c9d29a3a1d25c0a2209a191aa4dca1642d..a565d9db2f6433b44adfdbdc5c5e131054ce5b5a 100644 (file)
--- a/environment
+++ b/environment
@@ -1 +1 @@
-PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games"
+PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin"

diff --git a/grub.d/10_linux b/grub.d/10_linux
index a98e2b02b51abdea6481b6afb315482a1848788c..5a43f0c787b2337f2b4b9a8b07b9e10a72bffcad 100755 (executable)
--- a/grub.d/10_linux
+++ b/grub.d/10_linux
@@ -245,6 +245,14 @@ EOF
         linux_root_device_thisversion="PARTUUID=${GRUB_FORCE_PARTUUID}"
     fi
     message="$(gettext_printf "Loading initial ramdisk ...")"
+    initrd_path=
+    for i in ${initrd}; do
+        initrd_path="${initrd_path} ${rel_dirname}/${i}"
+    done
+    initrd_path_only_early=
+    for i in ${initrd_early}; do
+        initrd_path_only_early="${initrd_path_only_early} ${rel_dirname}/${i}"
+    done
     if test -n "${initrd}" && [ x"$GRUB_FORCE_PARTUUID" != x ]; then
         sed "s/^/$submenu_indentation/" << EOF
        if [ "\${initrdfail}" = 1 ]; then
@@ -255,11 +263,17 @@ EOF
          echo  '$(echo "$message" | grub_quote)'
 EOF
         fi
-
         sed "s/^/$submenu_indentation/" << EOF
-         initrd        ${rel_dirname}/${initrd}
+         initrd        $(echo $initrd_path)
        else
          linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} panic=-1
+EOF
+        if [ -n "$initrd_path_only_early" ]; then
+          sed "s/^/$submenu_indentation/" << EOF
+         initrd        $(echo $initrd_path_only_early)
+EOF
+        fi
+        sed "s/^/$submenu_indentation/" << EOF
        fi
        initrdfail
 EOF
@@ -277,7 +291,7 @@ EOF
 EOF
             fi
             sed "s/^/$submenu_indentation/" << EOF
-       initrd  ${rel_dirname}/${initrd}
+       initrd  $(echo $initrd_path)
 EOF
         fi
     fi
@@ -320,6 +334,10 @@ case "$machine" in
     *) GENKERNEL_ARCH="$machine" ;;
 esac
 
+case "$GENKERNEL_ARCH" in
+  x86*) GRUB_CMDLINE_LINUX_RECOVERY="$GRUB_CMDLINE_LINUX_RECOVERY dis_ucode_ldr";;
+esac
+
 prepare_boot_cache=
 prepare_root_cache=
 boot_device_id=
@@ -418,10 +436,7 @@ while [ "x$list" != "x" ] ; do
 
   initrd=
   if test -n "${initrd_early}" || test -n "${initrd_real}"; then
-    initrd="${initrd_real}"
-    if test -n "${initrd_early}"; then
-        initrd="${initrd_early} ${initrd}"
-    fi
+    initrd="${initrd_early} ${initrd_real}"
 
     initrd_display=
     for i in ${initrd}; do

diff --git a/grub.d/10_linux_zfs b/grub.d/10_linux_zfs
index ae93c406e01e508e1f684877bcfaa9cad7d63e23..4efb6817b0894050f38456077d4ee421ae17563b 100755 (executable)
--- a/grub.d/10_linux_zfs
+++ b/grub.d/10_linux_zfs
@@ -41,6 +41,16 @@ imported_pools=""
 MNTDIR="$(mktemp -d ${TMPDIR:-/tmp}/zfsmnt.XXXXXX)"
 ZFSTMP="$(mktemp -d ${TMPDIR:-/tmp}/zfstmp.XXXXXX)"
 
+
+machine="$(uname -m)"
+case "${machine}" in
+    i?86) GENKERNEL_ARCH="x86" ;;
+    mips|mips64) GENKERNEL_ARCH="mips" ;;
+    mipsel|mips64el) GENKERNEL_ARCH="mipsel" ;;
+    arm*) GENKERNEL_ARCH="arm" ;;
+    *) GENKERNEL_ARCH="${machine}" ;;
+esac
+
 RC=0
 on_exit() {
     # Restore initial zpool import state
@@ -407,18 +417,12 @@ get_dataset_info() {
         return
     fi
 
-    machine="$(uname -m)"
-    case "${machine}" in
-        i?86) GENKERNEL_ARCH="x86" ;;
-        mips|mips64) GENKERNEL_ARCH="mips" ;;
-        mipsel|mips64el) GENKERNEL_ARCH="mipsel" ;;
-        arm*) GENKERNEL_ARCH="arm" ;;
-        *) GENKERNEL_ARCH="${machine}" ;;
-    esac
-
     initrd_list=""
     kernel_list=""
-    for linux in $(find "${boot_dir}" -maxdepth 1 -type f -regex '.*/\(vmlinuz\|vmlinux\|kernel\)-.*'|sort -V); do
+    list=$(find "${boot_dir}" -maxdepth 1 -type f -regex '.*/\(vmlinuz\|vmlinux\|kernel\)-.*')
+    while [ "x$list" != "x" ] ; do
+        linux=`version_find_latest $list`
+        list=`echo $list | tr ' ' '\n' | fgrep -vx "$linux" | tr '\n' ' '`
         if ! grub_file_is_not_garbage "${linux}" ; then
             continue
         fi
@@ -465,12 +469,12 @@ get_dataset_info() {
 
         rel_linux_dirname=$(make_system_path_relative_to_its_root "${linux_dirname}")
 
-        initrd_list="${rel_linux_dirname}/${initrd}|${initrd_list}"
-        kernel_list="${rel_linux_dirname}/${linux_basename}|${kernel_list}"
+        initrd_list="${initrd_list}|${rel_linux_dirname}/${initrd}"
+        kernel_list="${kernel_list}|${rel_linux_dirname}/${linux_basename}"
     done
 
-    initrd_list="${initrd_list%|}"
-    kernel_list="${kernel_list%|}"
+    initrd_list="${initrd_list#|}"
+    kernel_list="${kernel_list#|}"
 
     initrd_device=$(${grub_probe} --target=device "${boot_dir}" | head -1)
 
@@ -904,6 +908,11 @@ generate_grub_menu() {
         GRUB_CMDLINE_LINUX_RECOVERY="${GRUB_CMDLINE_LINUX_RECOVERY} nomodeset"
     fi
 
+    case "$GENKERNEL_ARCH" in
+        x86*) GRUB_CMDLINE_LINUX_RECOVERY="$GRUB_CMDLINE_LINUX_RECOVERY dis_ucode_ldr";;
+    esac
+
+
     if [ "${vt_handoff}" = 1 ]; then
         for word in ${GRUB_CMDLINE_LINUX_DEFAULT}; do
             if [ "${word}" = splash ]; then