diff --git a/debian/changelog b/debian/changelog index 84e813b2..9fbb6e26 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.262) UNRELEASED; urgency=medium + + * fix typo in 99zz-check-uid-gid.chroot + * add systemd users to group and passwd files on touch + + -- Oliver Grawert Wed, 29 Oct 2014 19:54:28 +0100 + livecd-rootfs (2.261) vivid; urgency=medium * make diff not exit 1 if we show the diff for passwd, shadow, group etc diff --git a/live-build/ubuntu-touch/hooks/00-uid-gid-fix.chroot_early b/live-build/ubuntu-touch/hooks/00-uid-gid-fix.chroot_early index b0b13c95..5b3385b7 100755 --- a/live-build/ubuntu-touch/hooks/00-uid-gid-fix.chroot_early +++ b/live-build/ubuntu-touch/hooks/00-uid-gid-fix.chroot_early @@ -46,6 +46,10 @@ lxc-dnsmasq:x:109:114:LXC dnsmasq,,,:/var/lib/lxc:/bin/false pulse:x:110:115:PulseAudio daemon,,,:/var/run/pulse:/bin/false system:x:1000:1000:system,,,:/nonexistent:/bin/false radio:x:1001:1001:radio,,,:/nonexistent:/bin/false +systemd-timesync:x:111:113:systemd Time Synchronization,,,:/run/systemd:/bin/false +systemd-network:x:112:117:systemd Network Management,,,:/run/systemd/netif:/bin/false +systemd-resolve:x:113:118:systemd Resolver,,,:/run/systemd/resolve:/bin/false +systemd-bus-proxy:x:114:119:systemd Bus Proxy,,,:/run/systemd:/bin/false EOF else echo "/etc/passwd post-debootstrap hash doesn't match record" >&2 @@ -86,6 +90,10 @@ lxc-dnsmasq:!:16329:0:99999:7::: pulse:*:16329:0:99999:7::: system:!:16329:0:99999:7::: radio:!:16329:0:99999:7::: +systemd-timesync:*:16372:0:99999:7::: +systemd-network:*:16372:0:99999:7::: +systemd-resolve:*:16372:0:99999:7::: +systemd-bus-proxy:*:16372:0:99999:7::: EOF else echo "/etc/shadow post-debootstrap hash doesn't match record" >&2 @@ -162,6 +170,10 @@ sdcard_rw:x:1015: android_media:x:1013: android_nvram:x:9997: android_cache:x:2001: +systemd-timesync:x:113: +systemd-network:x:117: +systemd-resolve:x:118: +systemd-bus-proxy:x:119: EOF else echo "/etc/group post-debootstrap hash doesn't match record" >&2 @@ -238,6 +250,10 @@ sdcard_rw:!:: android_media:!:: android_nvram:!:: android_cache:!:: +systemd-timesync:!:: +systemd-network:!:: +systemd-resolve:!:: +systemd-bus-proxy:!:: EOF else echo "/etc/gshadow post-debootstrap hash doesn't match record" >&2 diff --git a/live-build/ubuntu-touch/hooks/99zz-check-uid-gid.chroot b/live-build/ubuntu-touch/hooks/99zz-check-uid-gid.chroot index 6e202855..6166e594 100755 --- a/live-build/ubuntu-touch/hooks/99zz-check-uid-gid.chroot +++ b/live-build/ubuntu-touch/hooks/99zz-check-uid-gid.chroot @@ -44,7 +44,7 @@ if [ -n "$ERRCNT" ]; then echo "live-build/ubuntu-touch/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 crated a home directory and," >&2 + echo "that added these entries perhaps created a home directory and," >&2 echo "if needed, add code for creation of it to the above hook" >&2 exit 1 fi