From 5f8355200a1f73de761c51216f10a5c2d85245d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Minier?= Date: Wed, 4 Feb 2015 13:28:43 +0100 Subject: [PATCH] Revert to r1033 to apply uncommitted upload. --- debian/changelog | 16 ++-------------- debian/control | 2 +- .../hooks/00-uid-gid-fix.chroot_early | 10 ++++------ .../ubuntu-core/includes.chroot/etc/resolv.conf | 2 +- 4 files changed, 8 insertions(+), 22 deletions(-) diff --git a/debian/changelog b/debian/changelog index e166fb73..425dfa97 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,4 @@ -livecd-rootfs (2.277) UNRELEASED; urgency=medium - - * 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 +livecd-rootfs (2.276) UNRELEASED; urgency=medium [ Mathieu Trudel-Lapierre ] * live-build/auto/config: add config for Ubuntu MATE. @@ -18,11 +10,7 @@ livecd-rootfs (2.276) vivid; urgency=medium * live-build/ubuntu-core/hooks/01-setup_user.chroot: - run with -e - [ Loïc Minier ] - * live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early: add new "input" - group to etc/group and etc/gshadow static maps. - - -- Loïc Minier Wed, 04 Feb 2015 13:16:52 +0100 + -- Mathieu Trudel-Lapierre Wed, 28 Jan 2015 11:00:23 -0500 livecd-rootfs (2.275+ppa2) vivid; urgency=medium diff --git a/debian/control b/debian/control index 52e4d3b2..8e7abdaa 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.6 +Standards-Version: 3.9.4 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 df651ddc..bb8cab52 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 < /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 < /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 < /etc/group <<'EOF' root:x:0: daemon:x:1: bin:x:2: @@ -133,7 +133,6 @@ 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 @@ -142,7 +141,7 @@ fi # /etc/gshadow if [ "$gshadow_bootstrap" = "$gshadow_hash" ]; then - cat > /etc/gshadow < /etc/gshadow <<'EOF' root:*:: daemon:*:: bin:*:: @@ -193,7 +192,6 @@ 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 0141cbbf..1a407ee1 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