From 7c61ea63074447d2cc51a0b9914745a3182c3c76 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Thu, 12 Feb 2015 11:33:28 +0100
Subject: [PATCH] add even more verbose output to
 live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early (thanks Oliver!)

---
 debian/changelog                              |  8 +++++++
 .../hooks/00-uid-gid-fix.chroot_early         | 21 +++++++++++++++----
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2241a790..305bef37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+livecd-rootfs (2.287) UNRELEASED; urgency=low
+
+  * add even more verbose output to
+    live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early
+    (thanks Oliver!)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 12 Feb 2015 11:33:00 +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/ubuntu-core/hooks/00-uid-gid-fix.chroot_early b/live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early
index 2deb089d..b28ef9f8 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,5 +1,7 @@
 #!/bin/sh -eu
 
+ERRCNT=""
+
 # Known good post-debootstrap values
 passwd_bootstrap="9738946debbc125bd6cf3f197582a8a5"
 shadow_bootstrap="4d299751999cae6de045390dd568812c"
@@ -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