committing changes in /etc made by "/usr/bin/apt full-upgrade -y"

Package changes:
-alsa-ucm-conf 1.2.2-1ubuntu0.12 all
+alsa-ucm-conf 1.2.2-1ubuntu0.13 all
-bolt 0.8-4ubuntu1 amd64
+bolt 0.9.1-2~ubuntu20.04.1 amd64
-ctdb 2:4.13.17~dfsg-0ubuntu0.21.04.1 amd64
+ctdb 2:4.13.17~dfsg-0ubuntu0.21.04.2 amd64
-grub-common 2.04-1ubuntu26.13 amd64
+grub-common 2.04-1ubuntu26.15 amd64
-grub-pc 2.04-1ubuntu26.13 amd64
-grub-pc-bin 2.04-1ubuntu26.13 amd64
-grub2-common 2.04-1ubuntu26.13 amd64
+grub-pc 2.04-1ubuntu26.15 amd64
+grub-pc-bin 2.04-1ubuntu26.15 amd64
+grub2-common 2.04-1ubuntu26.15 amd64
-libsmbclient 2:4.13.17~dfsg-0ubuntu0.21.04.1 amd64
+libsmbclient 2:4.13.17~dfsg-0ubuntu0.21.04.2 amd64
-libwbclient0 2:4.13.17~dfsg-0ubuntu0.21.04.1 amd64
+libwbclient0 2:4.13.17~dfsg-0ubuntu0.21.04.2 amd64
-python3-samba 2:4.13.17~dfsg-0ubuntu0.21.04.1 amd64
+python3-samba 2:4.13.17~dfsg-0ubuntu0.21.04.2 amd64
-samba 2:4.13.17~dfsg-0ubuntu0.21.04.1 amd64
-samba-common 2:4.13.17~dfsg-0ubuntu0.21.04.1 all
-samba-common-bin 2:4.13.17~dfsg-0ubuntu0.21.04.1 amd64
-samba-dsdb-modules 2:4.13.17~dfsg-0ubuntu0.21.04.1 amd64
-samba-libs 2:4.13.17~dfsg-0ubuntu0.21.04.1 amd64
-samba-vfs-modules 2:4.13.17~dfsg-0ubuntu0.21.04.1 amd64
+samba 2:4.13.17~dfsg-0ubuntu0.21.04.2 amd64
+samba-common 2:4.13.17~dfsg-0ubuntu0.21.04.2 all
+samba-common-bin 2:4.13.17~dfsg-0ubuntu0.21.04.2 amd64
+samba-dsdb-modules 2:4.13.17~dfsg-0ubuntu0.21.04.2 amd64
+samba-libs 2:4.13.17~dfsg-0ubuntu0.21.04.2 amd64
+samba-vfs-modules 2:4.13.17~dfsg-0ubuntu0.21.04.2 amd64
-smbclient 2:4.13.17~dfsg-0ubuntu0.21.04.1 amd64
+smbclient 2:4.13.17~dfsg-0ubuntu0.21.04.2 amd64
-ubuntu-advantage-tools 27.6~20.04.1 amd64
+ubuntu-advantage-tools 27.7~20.04.1 amd64
-winbind 2:4.13.17~dfsg-0ubuntu0.21.04.1 amd64
+winbind 2:4.13.17~dfsg-0ubuntu0.21.04.2 amd64

diff --git a/grub.d/10_linux b/grub.d/10_linux
index a91bb2de35c9d3248c1c88bd3361bb53a3269a85..1b9f091e167cc11c627be678f926ee92ed056f69 100755 (executable)
--- a/grub.d/10_linux
+++ b/grub.d/10_linux
@@ -378,7 +378,9 @@ else
   cat << EOF
 if [ "\${recordfail}" != 1 ]; then
   if [ -e \${prefix}/gfxblacklist.txt ]; then
-    if hwmatch \${prefix}/gfxblacklist.txt 3; then
+    if [ \${grub_platform} != pc ]; then
+      set linux_gfx_mode=keep
+    elif hwmatch \${prefix}/gfxblacklist.txt 3; then
       if [ \${match} = 0 ]; then
         set linux_gfx_mode=keep
       else

diff --git a/logrotate.d/ubuntu-advantage-tools b/logrotate.d/ubuntu-advantage-tools
index 76e6b47c816301ea48f15fe0c10f3599d262bfdf..7c6485729127c23e07dcc8d5d34bf0b912b914f2 100644 (file)
--- a/logrotate.d/ubuntu-advantage-tools
+++ b/logrotate.d/ubuntu-advantage-tools
@@ -2,6 +2,7 @@
 # of /var/log/ubuntu-advantage*.log files.
 /var/log/ubuntu-advantage*.log {
     su root root
+    create 0644 root root
     rotate 6
     monthly
     compress