diff --git a/debian/changelog b/debian/changelog index 2241a790..72418aac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +livecd-rootfs (2.287) vivid; urgency=low + + [ Michael Vogt ] + * add even more verbose output to + live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early + (thanks Oliver!) + * live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early: + - adjust the {group,gshadow}_bootstrap values. The audio group + used to be gid 1005 after the bootstrap and is now 29. + * live-build/auto/config: + - add snappy-ubuntu + + [ Oliver Grawert ] + * make sure /var/log is always owned by the syslog group on touch + + -- Oliver Grawert Wed, 18 Feb 2015 15:03:54 +0100 + livecd-rootfs (2.286) vivid; urgency=medium * touch: forcing package mir-platform-graphics-android to see if we're able diff --git a/live-build/auto/config b/live-build/auto/config index 8d7e0fdc..8396ecd6 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -372,6 +372,8 @@ case $PROJECT in add_package install isc-dhcp-client add_package install resolvconf add_package install click-apparmor + # no Task: header yet + add_package install ubuntu-snappy # add special azure package case $ARCH in 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 2deb089d..d5f53471 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 @@ -1,10 +1,12 @@ #!/bin/sh -eu +ERRCNT="" + # Known good post-debootstrap values passwd_bootstrap="9738946debbc125bd6cf3f197582a8a5" shadow_bootstrap="4d299751999cae6de045390dd568812c" -group_bootstrap="dd4a0ebdd3f5d170d5a46e6bade5c6c3" -gshadow_bootstrap="42025e85925432105b429b7c801a50a4" +group_bootstrap="63632e6266046ef7e59a1f090f93a2de" +gshadow_bootstrap="0b17c40c462aba03bed49ce62300de73" # Current post-debootstrap values passwd_hash=$(set -- $(md5sum /etc/passwd) && echo $1) @@ -47,7 +49,7 @@ else echo "The output below might help to resolve the issue" >&2 cat /etc/passwd echo "passwd md5sum: $passwd_hash" >&2 - exit 1 + ERRCNT=1 fi # /etc/shadow @@ -85,7 +87,7 @@ else echo "The output below might help to resolve the issue" >&2 cat /etc/shadow echo "shadow md5sum: $shadow_hash" >&2 - exit 1 + ERRCNT=1 fi # /etc/group @@ -149,7 +151,7 @@ else echo "The output below might help to resolve the issue" >&2 cat /etc/group echo "group md5sum: $group_hash" >&2 - exit 1 + ERRCNT=1 fi # /etc/gshadow @@ -213,7 +215,18 @@ else echo "The output below might help to resolve the issue" >&2 cat /etc/gshadow echo "gshadow md5sum: $gshadow_hash" >&2 - exit 1 + ERRCNT=1 +fi + +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 >&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 + echo "if needed, add code for creation of it to the above hook" >&2 + exit 1 fi 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 0b456332..ac83689f 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 @@ -298,6 +298,8 @@ mkdir -p /var/lib/usermetrics chown usermetrics:usermetrics /var/lib/usermetrics chmod 750 /var/lib/usermetrics +chgrp syslog /var/log + # Record the current state for later comparison for file in /etc/passwd /etc/shadow /etc/group /etc/gshadow; do rm -f ${file}-