summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2019-06-06 11:24:26 +0200
committeranonym <anonym@riseup.net>2019-06-06 12:45:48 +0200
commitc9a49da56c7643330f2a56a97693b9ccbf7a0f37 (patch)
tree1735cfbbf4051d8b5de62a1f8e5cafaeb748eb14
parent59a672feb7333db678785efc7dde26fbb079936d (diff)
Fix FTBFS by pinning the GID of the new Debian-exim group.
Fix-committed: #16780
-rwxr-xr-xconfig/chroot_local-hooks/04-change-gids-and-uids2
-rw-r--r--config/chroot_local-includes/usr/share/tails/build/group1
-rw-r--r--config/chroot_local-includes/usr/share/tails/build/passwd5
3 files changed, 6 insertions, 2 deletions
diff --git a/config/chroot_local-hooks/04-change-gids-and-uids b/config/chroot_local-hooks/04-change-gids-and-uids
index 7320916..417b1fa 100755
--- a/config/chroot_local-hooks/04-change-gids-and-uids
+++ b/config/chroot_local-hooks/04-change-gids-and-uids
@@ -119,6 +119,7 @@ Change_gid pulse-access 1200
Change_gid Debian-gdm 1210
Change_gid kvm 1500
Change_gid render 1510
+Change_gid Debian-exim 1520
# Finally, give these users and groups the desired UID/GID
Change_uid debian-tor 107
@@ -143,3 +144,4 @@ Change_gid pulse-access 120
Change_gid Debian-gdm 121
Change_gid kvm 150
Change_gid render 151
+Change_gid Debian-exim 152
diff --git a/config/chroot_local-includes/usr/share/tails/build/group b/config/chroot_local-includes/usr/share/tails/build/group
index b7b283c..2c79c20 100644
--- a/config/chroot_local-includes/usr/share/tails/build/group
+++ b/config/chroot_local-includes/usr/share/tails/build/group
@@ -46,6 +46,7 @@ crontab:x:107:
netdev:x:108:
kvm:x:150:
render:x:151:
+Debian-exim:x:152:
messagebus:x:105:
ssh:x:109:
memlockd:x:110:
diff --git a/config/chroot_local-includes/usr/share/tails/build/passwd b/config/chroot_local-includes/usr/share/tails/build/passwd
index 3dc63f7..79bd76b 100644
--- a/config/chroot_local-includes/usr/share/tails/build/passwd
+++ b/config/chroot_local-includes/usr/share/tails/build/passwd
@@ -20,8 +20,9 @@ systemd-timesync:x:100:102:systemd Time Synchronization,,,:/run/systemd:/bin/fal
systemd-network:x:101:103:systemd Network Management,,,:/run/systemd/netif:/bin/false
systemd-resolve:x:102:104:systemd Resolver,,,:/run/systemd/resolve:/bin/false
_apt:x:104:65534::/nonexistent:/bin/false
-messagebus:x:103:105::/var/run/dbus:/bin/false
-memlockd:x:105:110:memlockd system account,,,:/usr/lib/memlockd:/bin/false
+Debian-exim:x:103:152::/var/spool/exim4:/bin/false
+messagebus:x:105:105::/var/run/dbus:/bin/false
+memlockd:x:106:110:memlockd system account,,,:/usr/lib/memlockd:/bin/false
debian-tor:x:107:114::/var/lib/tor:/bin/false
speech-dispatcher:x:108:29:Speech Dispatcher,,,:/var/run/speech-dispatcher:/bin/false
colord:x:109:117:colord colour management daemon,,,:/var/lib/colord:/bin/false