1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117 | === modified file 'debian/changelog'
--- debian/changelog 2015-06-05 13:06:13 +0000
+++ debian/changelog 2015-06-05 16:16:37 +0000
@@ -1,3 +1,9 @@
+livecd-rootfs (2.309) UNRELEASED; urgency=medium
+
+ * Updated user/groups config for the desktop-next
+
+ -- Sebastien Bacher <seb128@ubuntu.com> Fri, 05 Jun 2015 17:38:37 +0200
+
livecd-rootfs (2.308) wily; urgency=medium
* Copy desktop-next hooks in the configuration
=== modified file 'live-build/ubuntu-desktop-next/hooks/00-uid-gid-fix.chroot_early'
--- live-build/ubuntu-desktop-next/hooks/00-uid-gid-fix.chroot_early 2015-04-22 08:34:26 +0000
+++ live-build/ubuntu-desktop-next/hooks/00-uid-gid-fix.chroot_early 2015-06-05 16:14:37 +0000
@@ -3,10 +3,10 @@
ERRCNT=""
# Known good post-debootstrap values
-passwd_bootstrap="af34a24499223f08ab713138bec7ff54"
-shadow_bootstrap="1fd73103260cbe5a13a4a38320de4129"
-group_bootstrap="9edf30f181a6fd1d860cc7f4a71aa640"
-gshadow_bootstrap="b9db51ef767ab98db963db69844635dd"
+passwd_bootstrap="1050cdb2fcde4d10c86399616f64dfdb"
+shadow_bootstrap="7fa48d7fb0e3a1ede9c98ff7b1b33622"
+group_bootstrap="63c26ba30ffcd19be36f02a88621ab91"
+gshadow_bootstrap="e42acfd7c494c6085b5f3d2b1e353995"
# Current post-debootstrap values
passwd_hash=$(set -- $(md5sum /etc/passwd) && echo $1)
@@ -44,6 +44,16 @@
systemd-bus-proxy:x:106:111:systemd Bus Proxy,,,:/run/systemd:/bin/false
docker:x:107:113::/nonexistent:/bin/false
syslog:x:108:114::/home/syslog:/bin/false
+usermetrics:x:109:115:User Metrics:/var/lib/usermetrics:/bin/false
+uuidd:x:110:116::/run/uuidd:/bin/false
+avahi:x:111:117:Avahi mDNS daemon,,,:/var/run/avahi-daemon:/bin/false
+dnsmasq:x:112:65534:dnsmasq,,,:/var/lib/misc:/bin/false
+pulse:x:113:118:PulseAudio daemon,,,:/var/run/pulse:/bin/false
+whoopsie:x:114:120::/nonexistent:/bin/false
+rtkit:x:115:124:RealtimeKit,,,:/proc:/bin/false
+usbmux:x:116:46:usbmux daemon,,,:/var/lib/usbmux:/bin/false
+colord:x:117:125:colord colour management daemon,,,:/var/lib/colord:/bin/false
+lightdm:x:118:127:Light Display Manager:/var/lib/lightdm:/bin/false
EOF
else
echo "/etc/passwd post-debootstrap hash doesn't match record" >&2
@@ -83,6 +93,16 @@
systemd-bus-proxy:*:16413:0:99999:7:::
docker:*:16413:0:99999:7:::
syslog:*:16521:0:99999:7:::
+usermetrics:*:16591:0:99999:7:::
+uuidd:*:16591:0:99999:7:::
+avahi:*:16591:0:99999:7:::
+dnsmasq:*:16591:0:99999:7:::
+pulse:*:16591:0:99999:7:::
+whoopsie:*:16591:0:99999:7:::
+rtkit:*:16591:0:99999:7:::
+usbmux:*:16591:0:99999:7:::
+colord:*:16591:0:99999:7:::
+lightdm:*:16591:0:99999:7:::
EOF
else
echo "/etc/shadow post-debootstrap hash doesn't match record" >&2
@@ -148,6 +168,20 @@
input:x:112:
docker:x:113:ubuntu
syslog:x:114:
+usermetrics:x:115:
+uuidd:x:116:
+avahi:x:117:
+pulse:x:118:
+pulse-access:x:119:
+whoopsie:x:120:
+bluetooth:x:121:
+mlocate:x:122:
+scanner:x:123:
+rtkit:x:124:
+colord:x:125:
+autopilot:x:126:
+lightdm:x:127:
+nopasswdlogin:x:128:
EOF
else
echo "/etc/group post-debootstrap hash doesn't match record" >&2
@@ -213,6 +247,20 @@
input:!::
docker:!::ubuntu
syslog:!::
+usermetrics:!::
+uuidd:!::
+avahi:!::
+pulse:!::
+pulse-access:!::
+whoopsie:!::
+bluetooth:!::
+mlocate:!::
+scanner:!::
+rtkit:!::
+colord:!::
+autopilot:!::
+lightdm:!::
+nopasswdlogin:!::
EOF
else
echo "/etc/gshadow post-debootstrap hash doesn't match record" >&2
@@ -225,7 +273,7 @@
if [ -n "$ERRCNT" ]; then
echo "There were changes to the password database," >&2
echo "please adjust the values in the livecd-rootfs source in the file:" >&2
- echo "live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early" >&2
+ echo "live-build/ubuntu-desktop-next/hooks/00-uid-gid-fix.chroot_early" >&2
echo >&2
echo "Please check also if a maintainer script of the package" >&2
echo "that added these entries perhaps created a home directory and," >&2
|