From bc80922506cd184cd9055bfbeaa016c3c00d896d Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Wed, 11 Feb 2015 18:25:11 +0100
Subject: [PATCH] Import patches-unapplied version 2.283 to
 ubuntu/vivid-proposed

Imported using git-ubuntu import.

Changelog parent: ec516d6897abb29fa9f7fec4623455b1eefbe137

New changelog entries:
  [ Michael Vogt ]
  * add more verbose output to
    live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early
    (thanks Oliver!)
  [ 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
---
 debian/changelog                              | 14 ++++++++++++
 .../hooks/00-uid-gid-fix.chroot_early         | 12 ++++++++++
 .../hooks/00-uid-gid-fix.chroot_early         | 22 ++++++++++++++-----
 3 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 65682d64..ac512b7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+livecd-rootfs (2.283) vivid; urgency=low
+
+  [ Michael Vogt ]
+  * add more verbose output to
+    live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early
+    (thanks Oliver!)
+
+  [ 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 <ogra@ubuntu.com>  Wed, 11 Feb 2015 18:25:11 +0100
+
 livecd-rootfs (2.282) vivid; urgency=medium
 
   * update the passwd hash for changed GID of syslog ... also add output of
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 766cc44e..2deb089d 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
@@ -44,6 +44,9 @@ docker:x:107:113::/nonexistent:/bin/false
 EOF
 else
     echo "/etc/passwd post-debootstrap hash doesn't match record" >&2
+    echo "The output below might help to resolve the issue" >&2
+    cat /etc/passwd
+    echo "passwd md5sum: $passwd_hash" >&2
     exit 1
 fi
 
@@ -79,6 +82,9 @@ docker:*:16413:0:99999:7:::
 EOF
 else
     echo "/etc/shadow post-debootstrap hash doesn't match record" >&2
+    echo "The output below might help to resolve the issue" >&2
+    cat /etc/shadow
+    echo "shadow md5sum: $shadow_hash" >&2
     exit 1
 fi
 
@@ -140,6 +146,9 @@ docker:x:113:
 EOF
 else
     echo "/etc/group post-debootstrap hash doesn't match record" >&2
+    echo "The output below might help to resolve the issue" >&2
+    cat /etc/group
+    echo "group md5sum: $group_hash" >&2
     exit 1
 fi
 
@@ -201,6 +210,9 @@ docker:!::
 EOF
 else
     echo "/etc/gshadow post-debootstrap hash doesn't match record" >&2
+    echo "The output below might help to resolve the issue" >&2
+    cat /etc/gshadow
+    echo "gshadow md5sum: $gshadow_hash" >&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 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