From 4b414c06a69593804f55ac09c1e627c3670039a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Minier?= <loic.minier@ubuntu.com>
Date: Wed, 4 Feb 2015 13:32:24 +0100
Subject: [PATCH] Reapply changes from 1033..1038; fix conflict in changelog.

* live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early: add new "input"
  group to etc/group and etc/gshadow static maps.
* live-build/ubuntu-core/includes.chroot/etc/resolv.conf: use relative
  symlink as suggested by lintian.
* Bump Standards-Version to 3.9.6.
---
 debian/changelog                                       | 10 ++++++++++
 debian/control                                         |  2 +-
 .../ubuntu-core/hooks/00-uid-gid-fix.chroot_early      | 10 ++++++----
 live-build/ubuntu-core/includes.chroot/etc/resolv.conf |  2 +-
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 40cbfe86..0cfaf448 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+livecd-rootfs (2.277) UNRELEASED; urgency=medium
+
+  * live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early: add new "input"
+    group to etc/group and etc/gshadow static maps.
+  * live-build/ubuntu-core/includes.chroot/etc/resolv.conf: use relative
+    symlink as suggested by lintian.
+  * Bump Standards-Version to 3.9.6.
+
+ -- Loïc Minier <loic.minier@ubuntu.com>  Wed, 04 Feb 2015 13:21:07 +0100
+
 livecd-rootfs (2.276) vivid; urgency=medium
 
   [ Mathieu Trudel-Lapierre ]
diff --git a/debian/control b/debian/control
index 8e7abdaa..52e4d3b2 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
 Priority: optional
 Build-Depends: debhelper (>= 7)
 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-Standards-Version: 3.9.4
+Standards-Version: 3.9.6
 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk
 
 Package: livecd-rootfs
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 bb8cab52..df651ddc 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
@@ -14,7 +14,7 @@ gshadow_hash=$(set -- $(md5sum /etc/gshadow) && echo $1)
 
 # /etc/passwd
 if [ "$passwd_bootstrap" = "$passwd_hash" ]; then
-    cat > /etc/passwd <<'EOF'
+    cat > /etc/passwd <<EOF
 root:x:0:0:root:/root:/bin/bash
 daemon:x:1:1:daemon:/usr/sbin:/usr/sbin/nologin
 bin:x:2:2:bin:/bin:/usr/sbin/nologin
@@ -48,7 +48,7 @@ fi
 
 # /etc/shadow
 if [ "$shadow_bootstrap" = "$shadow_hash" ]; then
-    cat > /etc/shadow <<'EOF'
+    cat > /etc/shadow <<EOF
 root:*:16329:0:99999:7:::
 daemon:*:16329:0:99999:7:::
 bin:*:16329:0:99999:7:::
@@ -82,7 +82,7 @@ fi
 
 # /etc/group
 if [ "$group_bootstrap" = "$group_hash" ]; then
-    cat > /etc/group <<'EOF'
+    cat > /etc/group <<EOF
 root:x:0:
 daemon:x:1:
 bin:x:2:
@@ -133,6 +133,7 @@ systemd-timesync:x:108:
 systemd-network:x:109:
 systemd-resolve:x:110:
 systemd-bus-proxy:x:111:
+input:x:112:
 EOF
 else
     echo "/etc/group post-debootstrap hash doesn't match record" >&2
@@ -141,7 +142,7 @@ fi
 
 # /etc/gshadow
 if [ "$gshadow_bootstrap" = "$gshadow_hash" ]; then
-    cat > /etc/gshadow <<'EOF'
+    cat > /etc/gshadow <<EOF
 root:*::
 daemon:*::
 bin:*::
@@ -192,6 +193,7 @@ systemd-timesync:!::
 systemd-network:!::
 systemd-resolve:!::
 systemd-bus-proxy:!::
+input:!::
 EOF
 else
     echo "/etc/gshadow post-debootstrap hash doesn't match record" >&2
diff --git a/live-build/ubuntu-core/includes.chroot/etc/resolv.conf b/live-build/ubuntu-core/includes.chroot/etc/resolv.conf
index 1a407ee1..0141cbbf 120000
--- a/live-build/ubuntu-core/includes.chroot/etc/resolv.conf
+++ b/live-build/ubuntu-core/includes.chroot/etc/resolv.conf
@@ -1 +1 @@
-/run/resolvconf/resolv.conf
\ No newline at end of file
+../run/resolvconf/resolv.conf
\ No newline at end of file