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

Imported using git-ubuntu import.

Changelog parent: cd40a96c8d2cdf81e0db94228a1e9357ecd7e58d

New changelog entries:
  * make diff not exit 1 if we show the diff for passwd, shadow, group etc

debian/changelog

@@ -1,3 +1,9 @@
+livecd-rootfs (2.261) vivid; urgency=medium
+
+  * make diff not exit 1 if we show the diff for passwd, shadow, group etc
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Wed, 29 Oct 2014 16:44:25 +0100
+
 livecd-rootfs (2.260) vivid; urgency=medium
 
   * properly redirect error output in 99zz-check-uid-gid.chroot so it ends up

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

@@ -15,26 +15,26 @@ gshadow_orig_length=$(cat /etc/gshadow.orig | wc -l)
 if [ "$passwd_hash" != "$passwd_orig_hash" ]; then
     echo "/etc/passwd has changed during setup." >&2
     echo "The new /etc/passwd md5sum is: $passwd_hash" >&2
-    diff -Nrup /etc/passwd.orig /etc/passwd >&2
+    diff -Nrup /etc/passwd.orig /etc/passwd >&2 || true
     ERRCNT=1
 fi
 
 if [ "$shadow_hash" != "$shadow_orig_hash" ]; then
     echo "/etc/shadow has changed during setup." >&2
     echo "The new /etc/shadow md5sum is: $shadow_hash" >&2
-    diff -Nrup /etc/shadow.orig /etc/shadow >&2
+    diff -Nrup /etc/shadow.orig /etc/shadow >&2 || true
     ERRCNT=1
 fi
 
 if [ "$group_length" != "$group_orig_length" ]; then
     echo "/etc/group has changed during setup." >&2
-    diff -Nrup /etc/group.orig /etc/group >&2
+    diff -Nrup /etc/group.orig /etc/group >&2 || true
     ERRCNT=1
 fi
 
 if [ "$gshadow_length" != "$gshadow_orig_length" ]; then
     echo "/etc/gshadow has changed during setup." >&2
-    diff -Nrup /etc/gshadow.orig /etc/gshadow >&2
+    diff -Nrup /etc/gshadow.orig /etc/gshadow >&2 || true
     ERRCNT=1
 fi