diff --git a/debian/changelog b/debian/changelog index 6cd72d93..11d2eba3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.350) UNRELEASED; urgency=medium + + * bump UID for tss user in snappy, else it matches dnsmasq and bad things + happen + + -- Oliver Grawert Thu, 22 Oct 2015 11:34:34 +0200 + livecd-rootfs (2.349) wily; urgency=medium * do not hardcode installation of grub-pc for amd64 in snappy images, diff --git a/live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early b/live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early index 41cb2ecb..90d039ad 100755 --- a/live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early +++ b/live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early @@ -45,7 +45,7 @@ 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 dnsmasq:x:109:65534:dnsmasq,,,:/var/lib/misc:/bin/false -tss:x:109:116::/var/lib/tpm:/bin/false +tss:x:110:116::/var/lib/tpm:/bin/false EOF else echo "/etc/passwd post-debootstrap hash doesn't match record" >&2