From ec8c53b26593986cec83ececa23c097c85ed6e88 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Wed, 11 Feb 2015 18:27:19 +0100 Subject: [PATCH] make sure to collect all output of all changed files in one go in 00-uid-gid-fix.chroot_early, that way we only need to fix it once and have all info in the logs --- debian/changelog | 8 ++++++- .../hooks/00-uid-gid-fix.chroot_early | 22 ++++++++++++++----- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index c1f326cd..1d32382d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,16 @@ livecd-rootfs (2.283) UNRELEASED; urgency=low + [ Michael Vogt ] * add more verbose output to live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early (thanks Oliver!) - -- Michael Vogt Wed, 11 Feb 2015 17:43:43 +0100 + [ Oliver Grawert ] + * make sure to collect all output of all changed files in one go in + 00-uid-gid-fix.chroot_early, that way we only need to fix it once and have + all info in the logs + + -- Oliver Grawert Wed, 11 Feb 2015 18:25:11 +0100 livecd-rootfs (2.282) vivid; urgency=medium 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 0563f7cf..ccb2eaca 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 @@ -1,9 +1,11 @@ #!/bin/sh -eu +ERRCNT="" + # Known good post-debootstrap values passwd_bootstrap="5e8366ef9c178b62079468966f38ce5f" shadow_bootstrap="1c562aa2ed2f443b9151953e800eca16" -group_bootstrap="60cd81599d39db5d624e63c8c18d4a5e" +group_bootstrap="11709d548918f428231ce5801f6da521" gshadow_bootstrap="3819432fb99fe6b8f38410c58d503de1" # Current post-debootstrap values @@ -56,7 +58,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 @@ -103,7 +105,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 @@ -188,7 +190,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 @@ -273,9 +275,19 @@ 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 # Create some missing directories mkdir -p /var/lib/lightdm