committing changes in /etc made by "apt-get install flatpak"

Package changes:
+flatpak 1.6.5-0ubuntu0.1 amd64
+libostree-1-1 2020.3-1 amd64

diff --git a/.etckeeper b/.etckeeper
index ef60aa2249041cfa8e4fe66535cead695f445b01..96eb475c790617bcb20b7bb38596615aef34e7c6 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -219,6 +219,7 @@ maybe chmod 0755 'X11/Xsession'
 maybe chmod 0755 'X11/Xsession.d'
 maybe chmod 0644 'X11/Xsession.d/01gtk3-nocsd'
 maybe chmod 0644 'X11/Xsession.d/20dbus_xdg-runtime'
+maybe chmod 0644 'X11/Xsession.d/20flatpak'
 maybe chmod 0644 'X11/Xsession.d/20x11-common_process-args'
 maybe chmod 0644 'X11/Xsession.d/30x11-common_xresources'
 maybe chmod 0644 'X11/Xsession.d/35x11-common_xhost-local'
@@ -2921,6 +2922,7 @@ maybe chmod 0644 'profile.d/appmenu-qt5.sh'
 maybe chmod 0644 'profile.d/apps-bin-path.sh'
 maybe chmod 0644 'profile.d/bash_completion.sh'
 maybe chmod 0644 'profile.d/cedilla-portuguese.sh'
+maybe chmod 0644 'profile.d/flatpak.sh'
 maybe chmod 0644 'profile.d/gawk.csh'
 maybe chmod 0644 'profile.d/gawk.sh'
 maybe chmod 0644 'profile.d/im-config_wayland.sh'

diff --git a/X11/Xsession.d/20flatpak b/X11/Xsession.d/20flatpak
new file mode 100644 (file)
index 0000000..6c6e113
--- /dev/null
+++ b/X11/Xsession.d/20flatpak
@@ -0,0 +1,26 @@
+if command -v flatpak > /dev/null; then
+    # set XDG_DATA_DIRS to include Flatpak installations
+
+    new_dirs=$(
+        (
+            unset G_MESSAGES_DEBUG
+            echo "${XDG_DATA_HOME:-"$HOME/.local/share"}/flatpak"
+            flatpak --installations
+        ) | (
+            new_dirs=
+            while read -r install_path
+            do
+                share_path=$install_path/exports/share
+                case ":$XDG_DATA_DIRS:" in
+                    (*":$share_path:"*) :;;
+                    (*":$share_path/:"*) :;;
+                    (*) new_dirs=${new_dirs:+${new_dirs}:}$share_path;;
+                esac
+            done
+            echo "$new_dirs"
+        )
+    )
+
+    export XDG_DATA_DIRS
+    XDG_DATA_DIRS="${new_dirs:+${new_dirs}:}${XDG_DATA_DIRS:-/usr/local/share:/usr/share}"
+fi

diff --git a/group b/group
index 4a24b355ac777b3919778cddb15f41f18e64d4dd..3be47203360176b72a0b8a3349f779c7baa07e38 100644 (file)
--- a/group
+++ b/group
@@ -95,3 +95,4 @@ tss:x:147:
 libvirt:x:148:mhoellein
 libvirt-qemu:x:64055:libvirt-qemu
 libvirt-dnsmasq:x:149:
+_flatpak:x:150:

diff --git a/group- b/group-
index 357419cd82fc5009897db768ab63ecf55686e7b8..4a24b355ac777b3919778cddb15f41f18e64d4dd 100644 (file)
--- a/group-
+++ b/group-
@@ -3,7 +3,7 @@ daemon:x:1:
 bin:x:2:
 sys:x:3:
 adm:x:4:syslog,mhoellein
-tty:x:5:mhoellein
+tty:x:5:mhoellein,syslog
 disk:x:6:
 lp:x:7:
 mail:x:8:

diff --git a/gshadow b/gshadow
index 2c244add66a0fbb44801d23568786ce34d520eba..1b5609e68ca507e51086ceed81bf395fddddd590 100644 (file)
--- a/gshadow
+++ b/gshadow
@@ -95,3 +95,4 @@ tss:!::
 libvirt:!::mhoellein
 libvirt-qemu:!::libvirt-qemu
 libvirt-dnsmasq:!::
+_flatpak:!::

diff --git a/gshadow- b/gshadow-
index 613fa26ca812f2db5ec9c10631aa08194558f833..2c244add66a0fbb44801d23568786ce34d520eba 100644 (file)
--- a/gshadow-
+++ b/gshadow-
@@ -3,7 +3,7 @@ daemon:*::
 bin:*::
 sys:*::
 adm:*::syslog,mhoellein
-tty:*::mhoellein
+tty:*::mhoellein,syslog
 disk:*::
 lp:*::
 mail:*::

diff --git a/passwd b/passwd
index c7b4fc325c5c3754cb4d949b65fd4ef85df47a9c..4e84f183fc59bb81a40ce4de141e0850b18d9424 100644 (file)
--- a/passwd
+++ b/passwd
@@ -62,3 +62,4 @@ tss:x:136:147:TPM software stack,,,:/var/lib/tpm:/bin/false
 gpsd:x:137:20:GPSD system user,,,:/run/gpsd:/bin/false
 libvirt-qemu:x:64055:139:Libvirt Qemu,,,:/var/lib/libvirt:/usr/sbin/nologin
 libvirt-dnsmasq:x:138:149:Libvirt Dnsmasq,,,:/var/lib/libvirt/dnsmasq:/usr/sbin/nologin
+_flatpak:x:139:150:Flatpak system-wide installation helper,,,:/nonexistent:/usr/sbin/nologin

diff --git a/passwd- b/passwd-
index 84445237ded61d85d4fe0e357227e969d2410366..84c335e1b4b43f28e04d9763cc88ff278e3f2426 100644 (file)
--- a/passwd-
+++ b/passwd-
@@ -61,4 +61,5 @@ nx:x:135:1015::/var/NX/nx:/etc/NX/nxserver
 tss:x:136:147:TPM software stack,,,:/var/lib/tpm:/bin/false
 gpsd:x:137:20:GPSD system user,,,:/run/gpsd:/bin/false
 libvirt-qemu:x:64055:139:Libvirt Qemu,,,:/var/lib/libvirt:/usr/sbin/nologin
-libvirt-dnsmasq:x:138:149::/var/lib/libvirt/dnsmasq:/usr/sbin/nologin
+libvirt-dnsmasq:x:138:149:Libvirt Dnsmasq,,,:/var/lib/libvirt/dnsmasq:/usr/sbin/nologin
+_flatpak:x:139:150::/nonexistent:/usr/sbin/nologin

diff --git a/profile.d/flatpak.sh b/profile.d/flatpak.sh
new file mode 100644 (file)
index 0000000..6c6e113
--- /dev/null
+++ b/profile.d/flatpak.sh
@@ -0,0 +1,26 @@
+if command -v flatpak > /dev/null; then
+    # set XDG_DATA_DIRS to include Flatpak installations
+
+    new_dirs=$(
+        (
+            unset G_MESSAGES_DEBUG
+            echo "${XDG_DATA_HOME:-"$HOME/.local/share"}/flatpak"
+            flatpak --installations
+        ) | (
+            new_dirs=
+            while read -r install_path
+            do
+                share_path=$install_path/exports/share
+                case ":$XDG_DATA_DIRS:" in
+                    (*":$share_path:"*) :;;
+                    (*":$share_path/:"*) :;;
+                    (*) new_dirs=${new_dirs:+${new_dirs}:}$share_path;;
+                esac
+            done
+            echo "$new_dirs"
+        )
+    )
+
+    export XDG_DATA_DIRS
+    XDG_DATA_DIRS="${new_dirs:+${new_dirs}:}${XDG_DATA_DIRS:-/usr/local/share:/usr/share}"
+fi

diff --git a/shadow b/shadow
index 8b792f4ccd2ebfe5c2e259e9f797a2238a57fabd..4fdd36949e2c1ae37e2b8b30c827cb2faf794dba 100644 (file)
--- a/shadow
+++ b/shadow
@@ -62,3 +62,4 @@ tss:*:18407:0:99999:7:::
 gpsd:*:18409:0:99999:7:::
 libvirt-qemu:!:18454:0:99999:7:::
 libvirt-dnsmasq:!:18454:0:99999:7:::
+_flatpak:*:18536:0:99999:7:::

diff --git a/shadow- b/shadow-
index 8b792f4ccd2ebfe5c2e259e9f797a2238a57fabd..4fdd36949e2c1ae37e2b8b30c827cb2faf794dba 100644 (file)
--- a/shadow-
+++ b/shadow-
@@ -62,3 +62,4 @@ tss:*:18407:0:99999:7:::
 gpsd:*:18409:0:99999:7:::
 libvirt-qemu:!:18454:0:99999:7:::
 libvirt-dnsmasq:!:18454:0:99999:7:::
+_flatpak:*:18536:0:99999:7:::