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

Imported using git-ubuntu import.

Changelog parent: f3ee6d7ce0ee92b68e2b49d326c97991d27dc739

New changelog entries:
  * add more verbose output to
    live-build/ubuntu-touch/hooks/00-uid-gid-fix.chroot_early
---
 debian/changelog                                          | 7 +++++++
 live-build/ubuntu-touch/hooks/00-uid-gid-fix.chroot_early | 8 ++++++++
 2 files changed, 15 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d0a03f90..8d39b96c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.281) vivid; urgency=medium
+
+  * add more verbose output to
+    live-build/ubuntu-touch/hooks/00-uid-gid-fix.chroot_early
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Wed, 11 Feb 2015 15:11:51 +0100
+
 livecd-rootfs (2.280) vivid; urgency=medium
 
   * live-build/ubuntu-core/hooks/02-add_user_to_groups.chroot: use commas
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 4f203560..21a1e293 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
@@ -53,6 +53,8 @@ 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
+    echo "The output below might help to resolve the issue" >&2
+    cat /etc/passwd
     exit 1
 fi
 
@@ -97,6 +99,8 @@ systemd-bus-proxy:*:16372: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
     exit 1
 fi
 
@@ -179,6 +183,8 @@ input:x:121:
 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
     exit 1
 fi
 
@@ -261,6 +267,8 @@ input:!::
 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
     exit 1
 fi