Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-03-11 19:31:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Imported using git-ubuntu import.

Changelog parent: 6583eeab58cec8ae20049b55a52a301f92722b7e

New changelog entries:
  * 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.
This commit is contained in:
Loïc Minier 2015-02-04 13:32:58 +01:00 committed by usd-importer
parent 6583eeab58
commit a2210d3df2
4 changed files with 18 additions and 6 deletions
debian
changelogcontrol
live-build/ubuntu-core
hooks
00-uid-gid-fix.chroot_early
includes.chroot/etc
resolv.conf

10
debian/changelog vendored

@ -1,3 +1,13 @@
livecd-rootfs (2.277) vivid; 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:32:58 +0100
livecd-rootfs (2.276) vivid; urgency=medium livecd-rootfs (2.276) vivid; urgency=medium
[ Mathieu Trudel-Lapierre ] [ Mathieu Trudel-Lapierre ]

2
debian/control vendored

@ -3,7 +3,7 @@ Section: devel
Priority: optional Priority: optional
Build-Depends: debhelper (>= 7) Build-Depends: debhelper (>= 7)
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> 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 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk
Package: livecd-rootfs Package: livecd-rootfs

10
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 # /etc/passwd
if [ "$passwd_bootstrap" = "$passwd_hash" ]; then if [ "$passwd_bootstrap" = "$passwd_hash" ]; then
cat > /etc/passwd <<'EOF' cat > /etc/passwd <<EOF
root:x:0:0:root:/root:/bin/bash root:x:0:0:root:/root:/bin/bash
daemon:x:1:1:daemon:/usr/sbin:/usr/sbin/nologin daemon:x:1:1:daemon:/usr/sbin:/usr/sbin/nologin
bin:x:2:2:bin:/bin:/usr/sbin/nologin bin:x:2:2:bin:/bin:/usr/sbin/nologin
@ -48,7 +48,7 @@ fi
# /etc/shadow # /etc/shadow
if [ "$shadow_bootstrap" = "$shadow_hash" ]; then if [ "$shadow_bootstrap" = "$shadow_hash" ]; then
cat > /etc/shadow <<'EOF' cat > /etc/shadow <<EOF
root:*:16329:0:99999:7::: root:*:16329:0:99999:7:::
daemon:*:16329:0:99999:7::: daemon:*:16329:0:99999:7:::
bin:*:16329:0:99999:7::: bin:*:16329:0:99999:7:::
@ -82,7 +82,7 @@ fi
# /etc/group # /etc/group
if [ "$group_bootstrap" = "$group_hash" ]; then if [ "$group_bootstrap" = "$group_hash" ]; then
cat > /etc/group <<'EOF' cat > /etc/group <<EOF
root:x:0: root:x:0:
daemon:x:1: daemon:x:1:
bin:x:2: bin:x:2:
@ -133,6 +133,7 @@ systemd-timesync:x:108:
systemd-network:x:109: systemd-network:x:109:
systemd-resolve:x:110: systemd-resolve:x:110:
systemd-bus-proxy:x:111: systemd-bus-proxy:x:111:
input:x:112:
EOF EOF
else else
echo "/etc/group post-debootstrap hash doesn't match record" >&2 echo "/etc/group post-debootstrap hash doesn't match record" >&2
@ -141,7 +142,7 @@ fi
# /etc/gshadow # /etc/gshadow
if [ "$gshadow_bootstrap" = "$gshadow_hash" ]; then if [ "$gshadow_bootstrap" = "$gshadow_hash" ]; then
cat > /etc/gshadow <<'EOF' cat > /etc/gshadow <<EOF
root:*:: root:*::
daemon:*:: daemon:*::
bin:*:: bin:*::
@ -192,6 +193,7 @@ systemd-timesync:!::
systemd-network:!:: systemd-network:!::
systemd-resolve:!:: systemd-resolve:!::
systemd-bus-proxy:!:: systemd-bus-proxy:!::
input:!::
EOF EOF
else else
echo "/etc/gshadow post-debootstrap hash doesn't match record" >&2 echo "/etc/gshadow post-debootstrap hash doesn't match record" >&2

2
live-build/ubuntu-core/includes.chroot/etc/resolv.conf

@ -1 +1 @@
/run/resolvconf/resolv.conf ../run/resolvconf/resolv.conf