Import patches-unapplied version 2.260 to ubuntu/vivid-proposed

Imported using git-ubuntu import.

Changelog parent: cf6d153711

New changelog entries:
  * properly redirect error output in 99zz-check-uid-gid.chroot so it ends up
    in the log files.

debian/changelog

@@ -1,3 +1,10 @@
+livecd-rootfs (2.260) vivid; urgency=medium
+
+  * properly redirect error output in 99zz-check-uid-gid.chroot so it ends up
+    in the log files.
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Wed, 29 Oct 2014 13:19:46 +0100
+
 livecd-rootfs (2.259) vivid; urgency=medium
 
   * merge ubuntu-core system-image fixes from the PPA:

live-build/ubuntu-touch/hooks/99zz-check-uid-gid.chroot

@@ -39,13 +39,13 @@ if [ "$gshadow_length" != "$gshadow_orig_length" ]; then
 fi
 
 if [ -n "$ERRCNT" ]; then
-	echo "There were changes to the password database,"
-	echo "please adjust the values in the livecd-rootfs source in the file:"
-	echo "live-build/ubuntu-touch/hooks/00-uid-gid-fix.chroot_early"
-	echo
-	echo "Please check also if a maintainer script of the package"
-	echo "that added these entries perhaps crated a home directory and,"
-	echo "if needed, add code for creation of it to the above hook"
+	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-touch/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 crated a home directory and," >&2
+	echo "if needed, add code for creation of it to the above hook" >&2
 	exit 1
 fi