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

author root <root@localhost>

Mon, 14 Sep 2020 09:00:41 +0000 (11:00 +0200)

committer root <root@localhost>

Mon, 14 Sep 2020 09:00:41 +0000 (11:00 +0200)
author root <root@localhost>
Mon, 14 Sep 2020 09:00:41 +0000 (11:00 +0200)
committer root <root@localhost>
Mon, 14 Sep 2020 09:00:41 +0000 (11:00 +0200)
diff --git a/.etckeeper b/.etckeeper

index 7e38ff08db8dd173e3024956ed8508bbfbab3f7e..548c4fd24fecb8c8c2b1376b6ef64f1fc9631508 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1602,7 +1602,6 @@ maybe chmod 0664 'default/keyboard'
  maybe chmod 0644 'default/libvirt-guests'
  maybe chmod 0644 'default/libvirtd'
  maybe chmod 0644 'default/locale'
-maybe chmod 0644 'default/motd-news'
  maybe chmod 0644 'default/mysql'
  maybe chmod 0644 'default/networkd-dispatcher'
  maybe chmod 0644 'default/networking'
@@ -1844,6 +1843,7 @@ maybe chmod 0644 'fonts/conf.avail/67-smc-keraleeyam.conf'
  maybe chmod 0644 'fonts/conf.avail/67-smc-raghumalayalamsans.conf'
  maybe chmod 0644 'fonts/conf.avail/67-smc-suruma.conf'
  maybe chmod 0644 'fonts/conf.avail/67-smc-uroob.conf'
+maybe chmod 0644 'fonts/conf.avail/69-language-selector-ar.conf'
  maybe chmod 0644 'fonts/conf.avail/69-language-selector-ja.conf'
  maybe chmod 0644 'fonts/conf.avail/69-language-selector-zh-cn.conf'
  maybe chmod 0644 'fonts/conf.avail/69-language-selector-zh-hk.conf'
diff --git a/default/motd-news b/default/motd-news

deleted file mode 100644 (file)

index 434e562..0000000
--- a/default/motd-news
+++ /dev/null
@@ -1,19 +0,0 @@
-# Enable/disable the dynamic MOTD news service
-# This is a useful way to provide dynamic, informative
-# information pertinent to the users and administrators
-# of the local system
-ENABLED=1
-
-# Configure the source of dynamic MOTD news
-# White space separated list of 0 to many news services
-# For security reasons, these must be https
-# and have a valid certificate
-# Canonical runs a service at motd.ubuntu.com, and you
-# can easily run one too
-URLS="https://motd.ubuntu.com"
-
-# Specify the time in seconds, you're willing to wait for
-# dynamic MOTD news
-# Note that news messages are fetched in the background by
-# a systemd timer, so this should never block boot or login
-WAIT=5
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/fonts/conf.avail/69-language-selector-ar.conf b/fonts/conf.avail/69-language-selector-ar.conf

new file mode 100644 (file)

index 0000000..31bf554
--- /dev/null
+++ b/fonts/conf.avail/69-language-selector-ar.conf
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+    <match target="pattern">
+        <test name="lang">
+            <string>ar</string>
+        </test>
+        <test qual="any" name="family">
+            <string>sans-serif</string>
+        </test>
+        <edit name="family" mode="prepend" binding="strong">
+            <string>Noto Sans</string>
+            <string>Noto Sans Arabic UI</string>
+        </edit>
+    </match>
+    <match target="pattern">
+        <test name="lang">
+            <string>ar</string>
+        </test>
+        <test qual="any" name="family">
+            <string>serif</string>
+        </test>
+        <edit name="family" mode="prepend" binding="strong">
+            <string>Noto Serif</string>
+            <string>Noto Naskh Arabic</string>
+        </edit>
+    </match>
+    <match target="pattern">
+        <test name="lang">
+            <string>ar</string>
+        </test>
+        <test qual="any" name="family">
+            <string>monospace</string>
+        </test>
+        <edit name="family" mode="prepend" binding="strong">
+            <string>Noto Sans Mono</string>
+            <string>Noto Naskh Arabic</string>
+        </edit>
+    </match>
+</fontconfig>
diff --git a/fonts/conf.d/69-language-selector-ar.conf b/fonts/conf.d/69-language-selector-ar.conf

new file mode 120000 (symlink)

index 0000000..5f5c849
--- /dev/null
+++ b/fonts/conf.d/69-language-selector-ar.conf
@@ -0,0 +1 @@
+../conf.avail/69-language-selector-ar.conf
+\ No newline at end of file
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
diff --git a/mailcap b/mailcap

index 2a22900e1b81b464978bf6805bec665ef6062d59..3d7665644615a696042cf78952a5e35806929644 100644 (file)
--- a/mailcap
+++ b/mailcap
@@ -895,6 +895,8 @@ x-content/audio-cdda; rhythmbox-client --select-source %s; test=test -n "$DISPLA
  x-scheme-handler/sgnl; /opt/Signal/signal-desktop --no-sandbox %s; test=test -n "$DISPLAY"
  application/octet-stream; /usr/bin/skypeforlinux --share-file %s; test=test -n "$DISPLAY"
  x-scheme-handler/skype; /usr/bin/skypeforlinux --shutdown %s; test=test -n "$DISPLAY"
+x-scheme-handler/tel; /usr/bin/skypeforlinux --shutdown %s; test=test -n "$DISPLAY"
+x-scheme-handler/callto; /usr/bin/skypeforlinux --shutdown %s; test=test -n "$DISPLAY"
  application/sla; slic3r --gui %s; test=test -n "$DISPLAY"
  model/x-wavefront-obj; slic3r --gui %s; test=test -n "$DISPLAY"
  model/x-geomview-off; slic3r --gui %s; test=test -n "$DISPLAY"
diff --git a/update-motd.d/50-motd-news b/update-motd.d/50-motd-news

index 912e7685e0fc239bb89c084fe1af8e6e9bbb4342..4b0b56a771940dc5088ac779cfa81596aea4ea0b 100755 (executable)
--- a/update-motd.d/50-motd-news
+++ b/update-motd.d/50-motd-news
@@ -1,10 +1,11 @@
  #!/bin/sh
  #
  #    50-motd-news - print the live news from the Ubuntu wire
-#    Copyright (C) 2016-2017 Canonical Ltd.
+#    Copyright (C) 2016-2020 Canonical Ltd.
  #    Copyright (C) 2016-2017 Dustin Kirkland
  #
  #    Authors: Dustin Kirkland <kirkland@canonical.com>
+#             Steve Langasek <steve.langasek@canonical.com>
  #
  #    This program is free software; you can redistribute it and/or modify
  #    it under the terms of the GNU General Public License as published by
@@ -64,6 +65,9 @@ fi
  # If we've made it here, we've been given the --force argument,
  # probably from the systemd motd-news.service.  Let's update...
  
+# Abort early if wget is missing
+[ -x /usr/bin/wget ] || exit 0
+
  # Generate our temp files, clean up when done
  NEWS=$(mktemp) || exit 1
  ERR=$(mktemp) || exit 1
@@ -73,8 +77,8 @@ trap "rm -f $NEWS $ERR $CLOUD" HUP INT QUIT ILL TRAP KILL BUS TERM
  # Construct a user agent, similar to Firefox/Chrome/Safari/IE to
  # ensure a proper, tailored, accurate message of the day
  
-# Curl browser version, for debug purposes
-curl_ver="$(dpkg -l curl | awk '$1 == "ii" { print($3); exit(0); }')"
+# wget browser version, for debug purposes
+wget_ver="$(dpkg -l wget | awk '$1 == "ii" { print($3); exit(0); }')"
  
  # Distribution version, for messages releated to this Ubuntu release
  . /etc/lsb-release
@@ -97,12 +101,8 @@ if [ -x /usr/bin/cloud-id ]; then
      fi
  fi
  
-# Some messages may only be pertinent before or after some amount of uptime
-read up idle < /proc/uptime
-uptime="uptime/$up/$idle"
-
  # Piece together the user agent
-USER_AGENT="curl/$curl_ver $lsb $platform $cpu $uptime cloud_id/$cloud_id"
+USER_AGENT="wget/$wget_ver $lsb $platform $cpu cloud_id/$cloud_id"
  
  # Loop over any configured URLs
  for u in $URLS; do
@@ -121,7 +121,18 @@ for u in $URLS; do
         # If we're forced, set the wait to much higher (1 minute)
         [ "$FORCED" = "1" ] && WAIT=60
         # Fetch and print the news motd
-       if curl --connect-timeout "$WAIT" --max-time "$WAIT" -A "$USER_AGENT" -o- "$u" >"$NEWS" 2>"$ERR"; then
+       result=0
+       not_found_is_ok=0
+       wget --timeout "$WAIT" -U "$USER_AGENT" -O- --content-on-error "$u" >"$NEWS" 2>"$ERR" || result=$?
+       # from wget's manpage: 8   Server issued an error response.
+       if [ $result -eq 8 ]; then
+               if grep -q "ERROR 404" "$ERR"; then
+                       # The server's 404 document is the generic, non cloud-specific, motd-news
+                       # content present in the index.txt file
+                       not_found_is_ok=1
+               fi
+       fi
+       if [ $result -eq 0 ] || [ $not_found_is_ok -eq 1 ]; then
                 echo
                 # At most, 10 lines of text, remove control characters, print at most 80 characters per line
                 safe_print "$NEWS"
author	root <root@localhost>
	Mon, 14 Sep 2020 09:00:41 +0000 (11:00 +0200)
committer	root <root@localhost>
	Mon, 14 Sep 2020 09:00:41 +0000 (11:00 +0200)
.etckeeper		patch \| blob \| history
default/motd-news	[deleted file]	patch \| blob \| history
environment		patch \| blob \| history
fonts/conf.avail/69-language-selector-ar.conf	[new file with mode: 0644]	patch \| blob
fonts/conf.d/69-language-selector-ar.conf	[new symlink]	patch \| blob
grub.d/10_linux		patch \| blob \| history
grub.d/10_linux_zfs		patch \| blob \| history
mailcap		patch \| blob \| history
update-motd.d/50-motd-news		patch \| blob \| history