From: root Date: Mon, 14 Sep 2020 09:00:41 +0000 (+0200) Subject: committing changes in /etc made by "apt-get upgrade" X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=7ea40ae5335eed04706e1268263482490ed1bfb9;p=zenbook 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 -base-files 11ubuntu5.1 amd64 +base-files 11ubuntu5.2 amd64 -chromium-codecs-ffmpeg-extra 84.0.4147.105-0ubuntu0.20.04.1 amd64 +chromium-codecs-ffmpeg-extra 1:85.0.4183.83-0ubuntu0.20.04.1 amd64 -command-not-found 20.04.2 all +command-not-found 20.04.4 all -firefox 80.0+build2-0ubuntu0.20.04.1 amd64 -firefox-locale-de 80.0+build2-0ubuntu0.20.04.1 amd64 +firefox 80.0.1+build1-0ubuntu0.20.04.1 amd64 +firefox-locale-de 80.0.1+build1-0ubuntu0.20.04.1 amd64 -fonts-noto-core 20200323-1 all -fonts-noto-mono 20200323-1 all -fonts-noto-ui-core 20200323-1 all +fonts-noto-core 20200323-1build1~ubuntu20.04.1 all +fonts-noto-mono 20200323-1build1~ubuntu20.04.1 all +fonts-noto-ui-core 20200323-1build1~ubuntu20.04.1 all -grub-common 2.04-1ubuntu26.2 amd64 -grub-efi-amd64 2.04-1ubuntu26.2 amd64 -grub-efi-amd64-bin 2.04-1ubuntu26.2 amd64 -grub-efi-amd64-signed 1.142.4+2.04-1ubuntu26.2 amd64 -grub2-common 2.04-1ubuntu26.2 amd64 +grub-common 2.04-1ubuntu26.3 amd64 +grub-efi-amd64 2.04-1ubuntu26.3 amd64 +grub-efi-amd64-bin 2.04-1ubuntu26.3 amd64 +grub-efi-amd64-signed 1.142.5+2.04-1ubuntu26.3 amd64 +grub2-common 2.04-1ubuntu26.3 amd64 -language-selector-common 0.204 all -language-selector-gnome 0.204 all +language-selector-common 0.204.1 all +language-selector-gnome 0.204.1 all -libasound2 1.2.2-2.1ubuntu1 amd64 -libasound2 1.2.2-2.1ubuntu1 i386 -libasound2-data 1.2.2-2.1ubuntu1 all +libasound2 1.2.2-2.1ubuntu2 amd64 +libasound2 1.2.2-2.1ubuntu2 i386 +libasound2-data 1.2.2-2.1ubuntu2 all -libatopology2 1.2.2-2.1ubuntu1 amd64 +libatopology2 1.2.2-2.1ubuntu2 amd64 -libfreerdp-client2-2 2.1.1+dfsg1-0ubuntu0.20.04.1 amd64 +libfreerdp-client2-2 2.2.0+dfsg1-0ubuntu0.20.04.1 amd64 -libfreerdp2-2 2.1.1+dfsg1-0ubuntu0.20.04.1 amd64 +libfreerdp2-2 2.2.0+dfsg1-0ubuntu0.20.04.1 amd64 -libnss3 2:3.49.1-1ubuntu1.4 amd64 -libnss3 2:3.49.1-1ubuntu1.4 i386 +libnss3 2:3.49.1-1ubuntu1.5 amd64 +libnss3 2:3.49.1-1ubuntu1.5 i386 -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 -libpulse-mainloop-glib0 1:13.99.1-1ubuntu3.5 amd64 -libpulse0 1:13.99.1-1ubuntu3.5 amd64 -libpulse0 1:13.99.1-1ubuntu3.5 i386 -libpulsedsp 1:13.99.1-1ubuntu3.5 amd64 +libpulse-mainloop-glib0 1:13.99.1-1ubuntu3.6 amd64 +libpulse0 1:13.99.1-1ubuntu3.6 amd64 +libpulse0 1:13.99.1-1ubuntu3.6 i386 +libpulsedsp 1:13.99.1-1ubuntu3.6 amd64 -libwinpr2-2 2.1.1+dfsg1-0ubuntu0.20.04.1 amd64 +libwinpr2-2 2.2.0+dfsg1-0ubuntu0.20.04.1 amd64 -libx11-6 2:1.6.9-2ubuntu1 amd64 -libx11-6 2:1.6.9-2ubuntu1 i386 -libx11-data 2:1.6.9-2ubuntu1 all -libx11-dev 2:1.6.9-2ubuntu1 amd64 +libx11-6 2:1.6.9-2ubuntu1.1 amd64 +libx11-6 2:1.6.9-2ubuntu1.1 i386 +libx11-data 2:1.6.9-2ubuntu1.1 all +libx11-dev 2:1.6.9-2ubuntu1.1 amd64 -libx11-xcb1 2:1.6.9-2ubuntu1 amd64 -libx11-xcb1 2:1.6.9-2ubuntu1 i386 +libx11-xcb1 2:1.6.9-2ubuntu1.1 amd64 +libx11-xcb1 2:1.6.9-2ubuntu1.1 i386 -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-47.51 amd64 -linux-tools-common 5.4.0-42.46 all +linux-tools-common 5.4.0-47.51 all -memtest86+ 5.01-3.1ubuntu1 amd64 +memtest86+ 5.01-3.1ubuntu2.1 amd64 -pulseaudio 1:13.99.1-1ubuntu3.5 amd64 -pulseaudio-module-bluetooth 1:13.99.1-1ubuntu3.5 amd64 -pulseaudio-utils 1:13.99.1-1ubuntu3.5 amd64 +pulseaudio 1:13.99.1-1ubuntu3.6 amd64 +pulseaudio-module-bluetooth 1:13.99.1-1ubuntu3.6 amd64 +pulseaudio-utils 1:13.99.1-1ubuntu3.6 amd64 -python3-commandnotfound 20.04.2 all +python3-commandnotfound 20.04.4 all -python3-distupgrade 1:20.04.24 all +python3-distupgrade 1:20.04.25 all -skypeforlinux 8.63.0.76 amd64 +skypeforlinux 8.64.0.80 amd64 -ubuntu-minimal 1.450.1 amd64 +ubuntu-minimal 1.450.2 amd64 -ubuntu-release-upgrader-core 1:20.04.24 all -ubuntu-release-upgrader-gtk 1:20.04.24 all +ubuntu-release-upgrader-core 1:20.04.25 all +ubuntu-release-upgrader-gtk 1:20.04.25 all -ubuntu-standard 1.450.1 amd64 +ubuntu-standard 1.450.2 amd64 -xserver-common 2:1.20.8-2ubuntu2.2 all -xserver-xephyr 2:1.20.8-2ubuntu2.2 amd64 +xserver-common 2:1.20.8-2ubuntu2.4 all +xserver-xephyr 2:1.20.8-2ubuntu2.4 amd64 -xserver-xorg-core 2:1.20.8-2ubuntu2.2 amd64 +xserver-xorg-core 2:1.20.8-2ubuntu2.4 amd64 -xserver-xorg-legacy 2:1.20.8-2ubuntu2.2 amd64 +xserver-xorg-legacy 2:1.20.8-2ubuntu2.4 amd64 -xwayland 2:1.20.8-2ubuntu2.2 amd64 +xwayland 2:1.20.8-2ubuntu2.4 amd64 --- diff --git a/.etckeeper b/.etckeeper index 7e38ff0..548c4fd 100755 --- 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 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 048769c..a565d9d 100644 --- 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 index 0000000..31bf554 --- /dev/null +++ b/fonts/conf.avail/69-language-selector-ar.conf @@ -0,0 +1,40 @@ + + + + + + ar + + + sans-serif + + + Noto Sans + Noto Sans Arabic UI + + + + + ar + + + serif + + + Noto Serif + Noto Naskh Arabic + + + + + ar + + + monospace + + + Noto Sans Mono + Noto Naskh Arabic + + + diff --git a/fonts/conf.d/69-language-selector-ar.conf b/fonts/conf.d/69-language-selector-ar.conf new file mode 120000 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 a98e2b0..5a43f0c 100755 --- 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 ae93c40..4efb681 100755 --- 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 2a22900..3d76656 100644 --- 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 912e768..4b0b56a 100755 --- 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 +# Steve Langasek # # 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"