From: root Date: Tue, 24 Jul 2018 08:37:30 +0000 (+0200) Subject: committing changes in /etc after apt run X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=e6df2c02f8712bfdeaac1e7a32896e4af214da75;p=zenbook committing changes in /etc after apt run Package changes: -adobe-flash-properties-gtk 1:20180607.1-0ubuntu0.16.04.1 amd64 -adobe-flashplugin 1:20180607.1-0ubuntu0.16.04.1 amd64 +adobe-flash-properties-gtk 1:20180710.1-0ubuntu0.16.04.1 amd64 +adobe-flashplugin 1:20180710.1-0ubuntu0.16.04.1 amd64 -base-files 9.4ubuntu4.6 amd64 +base-files 9.4ubuntu4.7 amd64 -firefox 62.0~b7+build1-0ubuntu0.16.04.1 amd64 -firefox-locale-de 62.0~b7+build1-0ubuntu0.16.04.1 amd64 +firefox 62.0~b11+build1-0ubuntu0.16.04.1 amd64 +firefox-locale-de 62.0~b11+build1-0ubuntu0.16.04.1 amd64 -libxnvctrl0 396.24-0ubuntu0~gpu16.04.1 amd64 +libxnvctrl0 396.45-0ubuntu0~gpu16.04.1 amd64 -linux-libc-dev 4.4.0-130.156 amd64 -linux-libc-dev 4.4.0-130.156 i386 +linux-libc-dev 4.4.0-131.157 amd64 +linux-libc-dev 4.4.0-131.157 i386 -nvidia-settings 396.24-0ubuntu0~gpu16.04.1 amd64 +nvidia-settings 396.45-0ubuntu0~gpu16.04.1 amd64 -oracle-java8-installer 8u171-1~webupd8~1 all -oracle-java8-set-default 8u171-1~webupd8~1 all +oracle-java8-installer 8u181-1~webupd8~1 all +oracle-java8-set-default 8u181-1~webupd8~1 all -python-apt-common 1.1.0~beta1ubuntu0.16.04.1 all +python-apt-common 1.1.0~beta1ubuntu0.16.04.2 all -python3-apt 1.1.0~beta1ubuntu0.16.04.1 amd64 +python3-apt 1.1.0~beta1ubuntu0.16.04.2 amd64 -signal-desktop 1.13.0 amd64 +signal-desktop 1.14.4 amd64 -snapd 2.32.9 amd64 +snapd 2.33.1ubuntu2 amd64 -squashfs-tools 1:4.3-3ubuntu2.16.04.1 amd64 +squashfs-tools 1:4.3-3ubuntu2.16.04.2 amd64 -ubuntu-core-launcher 2.32.9 amd64 +ubuntu-core-launcher 2.33.1ubuntu2 amd64 --- diff --git a/apparmor.d/usr.lib.snapd.snap-confine.real b/apparmor.d/usr.lib.snapd.snap-confine.real index 54a1015..61c5319 100644 --- a/apparmor.d/usr.lib.snapd.snap-confine.real +++ b/apparmor.d/usr.lib.snapd.snap-confine.real @@ -13,6 +13,7 @@ # We run privileged, so be fanatical about what we include and don't use # any abstractions /etc/ld.so.cache r, + /etc/ld.so.preload r, /{,usr/}lib{,32,64,x32}/{,@{multiarch}/}ld-*.so mrix, # libc, you are funny /{,usr/}lib{,32,64,x32}/{,@{multiarch}/}libc{,-[0-9]*}.so* mr, @@ -47,6 +48,7 @@ # cgroup: devices capability sys_admin, + capability dac_read_search, capability dac_override, /sys/fs/cgroup/devices/snap{,py}.*/ w, /sys/fs/cgroup/devices/snap{,py}.*/tasks w, @@ -139,7 +141,7 @@ # when a distro with merged /usr and / that uses apparmor shows up it # should be handled here. /{,run/}media/ w, - mount options=(rw rbind) /media/ -> /tmp/snap.rootfs_*/media/, + mount options=(rw rbind) /{,run/}media/ -> /tmp/snap.rootfs_*/{,run/}media/, /run/netns/ w, mount options=(rw rbind) /run/netns/ -> /tmp/snap.rootfs_*/run/netns/, # unidirectional mounts (only for classic system) @@ -196,7 +198,7 @@ mount options=(rw slave) -> /tmp/snap.rootfs_*/usr/bin/snapctl, # /etc/alternatives (classic) - mount options=(rw bind) /snap/{,ubuntu-}core/*/etc/alternatives/ -> /tmp/snap.rootfs_*/etc/alternatives/, + mount options=(rw bind) /snap/*/*/etc/alternatives/ -> /tmp/snap.rootfs_*/etc/alternatives/, mount options=(rw bind) /snap/*/*/etc/ssl/ -> /tmp/snap.rootfs_*/etc/ssl/, mount options=(rw bind) /snap/*/*/etc/nsswitch.conf -> /tmp/snap.rootfs_*/etc/nsswitch.conf, # /etc/alternatives (core) @@ -218,6 +220,9 @@ umount /var/lib/snapd/hostfs/proc/, mount options=(rw rslave) -> /var/lib/snapd/hostfs/, + # set up user mount namespace + mount options=(rslave) -> /, + # Allow reading the os-release file (possibly a symlink to /usr/lib). /{etc/,usr/lib/}os-release r, @@ -266,6 +271,11 @@ mount fstype=tmpfs options=(rw nodev noexec) none -> /tmp/snap.rootfs_*/var/lib/snapd/lib/vulkan/, mount options=(remount ro) -> /tmp/snap.rootfs_*/var/lib/snapd/lib/vulkan/, + # GLVND EGL vendor + /tmp/snap.rootfs_*/var/lib/snapd/lib/glvnd/{,*} w, + mount fstype=tmpfs options=(rw nodev noexec) none -> /tmp/snap.rootfs_*/var/lib/snapd/lib/glvnd/, + mount options=(remount ro) -> /tmp/snap.rootfs_*/var/lib/snapd/lib/glvnd/, + # create gl dirs as needed /tmp/snap.rootfs_*/ r, /tmp/snap.rootfs_*/var/ r, @@ -276,6 +286,8 @@ /tmp/snap.rootfs_*/var/lib/snapd/lib/gl{,32}/** rw, /tmp/snap.rootfs_*/var/lib/snapd/lib/vulkan/ r, /tmp/snap.rootfs_*/var/lib/snapd/lib/vulkan/** rw, + /tmp/snap.rootfs_*/var/lib/snapd/lib/glvnd/ r, + /tmp/snap.rootfs_*/var/lib/snapd/lib/glvnd/** rw, # for chroot on steroids, we use pivot_root as a better chroot that makes # apparmor rules behave the same on classic and outside of classic. diff --git a/issue b/issue index cb9fc1f..8df41ea 100644 --- a/issue +++ b/issue @@ -1,2 +1,2 @@ -Ubuntu 16.04.4 LTS \n \l +Ubuntu 16.04.5 LTS \n \l diff --git a/issue.net b/issue.net index 2556083..f9bd4bf 100644 --- a/issue.net +++ b/issue.net @@ -1 +1 @@ -Ubuntu 16.04.4 LTS +Ubuntu 16.04.5 LTS diff --git a/lsb-release b/lsb-release index cf61ec5..e34bc4d 100644 --- a/lsb-release +++ b/lsb-release @@ -1,4 +1,4 @@ DISTRIB_ID=Ubuntu DISTRIB_RELEASE=16.04 DISTRIB_CODENAME=xenial -DISTRIB_DESCRIPTION="Ubuntu 16.04.4 LTS" +DISTRIB_DESCRIPTION="Ubuntu 16.04.5 LTS" diff --git a/profile.d/apps-bin-path.sh b/profile.d/apps-bin-path.sh index c6d0b01..ad06ccf 100644 --- a/profile.d/apps-bin-path.sh +++ b/profile.d/apps-bin-path.sh @@ -1,14 +1,22 @@ #!/bin/sh --this-shebang-is-just-here-to-inform-shellcheck-- # Expand $PATH to include the directory where snappy applications go. -if [ "${PATH#*/snap/bin}" = "${PATH}" ]; then - export PATH=$PATH:/snap/bin +snap_bin_path="/snap/bin" +if [ -n "${PATH##*${snap_bin_path}}" -a -n "${PATH##*${snap_bin_path}:*}" ]; then + export PATH=$PATH:${snap_bin_path} fi -# desktop files (used by desktop environments within both X11 and Wayland) are +# Ensure base distro defaults xdg path are set if nothing filed up some +# defaults yet. +if [ -z "$XDG_DATA_DIRS" ]; then + export XDG_DATA_DIRS="/usr/local/share:/usr/share" +fi + +# Desktop files (used by desktop environments within both X11 and Wayland) are # looked for in XDG_DATA_DIRS; make sure it includes the relevant directory for # snappy applications' desktop files. -if [ "${XDG_DATA_DIRS#*/snapd/desktop}" = "${XDG_DATA_DIRS}" ]; then - export XDG_DATA_DIRS="${XDG_DATA_DIRS:-/usr/local/share:/usr/share}:/var/lib/snapd/desktop" +snap_xdg_path="/var/lib/snapd/desktop" +if [ -n "${XDG_DATA_DIRS##*${snap_xdg_path}}" -a -n "${XDG_DATA_DIRS##*${snap_xdg_path}:*}" ]; then + export XDG_DATA_DIRS="${XDG_DATA_DIRS}:${snap_xdg_path}" fi