Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-02-23 03:11:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Import patches-unapplied version 2.262 to ubuntu/vivid-proposed

Browse Source 
Imported using git-ubuntu import.

Changelog parent: ddcf18baa443f0565d526464258758f913ca2a01

New changelog entries:
  * fix typo in 99zz-check-uid-gid.chroot
  * add systemd users to group and passwd files on touch
This commit is contained in:
Oliver Grawert 2014-10-29 19:54:28 +01:00 committed by usd-importer
parent ddcf18baa4
commit 75fc29334d
3 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.262) vivid; urgency=medium
* fix typo in 99zz-check-uid-gid.chroot
* add systemd users to group and passwd files on touch
-- Oliver Grawert <ogra@ubuntu.com> 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

16
live-build/ubuntu-touch/hooks/00-uid-gid-fix.chroot_early
View File

@ -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

2
live-build/ubuntu-touch/hooks/99zz-check-uid-gid.chroot
View File

@ -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