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 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 -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 < /etc/shadow <<'EOF' + cat > /etc/shadow < /etc/group <<'EOF' + cat > /etc/group <&2 @@ -141,7 +142,7 @@ fi # /etc/gshadow if [ "$gshadow_bootstrap" = "$gshadow_hash" ]; then - cat > /etc/gshadow <<'EOF' + cat > /etc/gshadow <&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