Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-02-22 02:41:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reapply changes from 1033..1038; fix conflict in changelog.

Browse Source 
* 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:24 +01:00
parent 348f148df0
commit 4b414c06a6
4 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
debian/changelog vendored
View File

@ -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 ]

2
debian/control vendored
View File

@ -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

10
live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early
View File

@ -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

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

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