From 808414beec1a50b808a55b24250e57c2d152efa6 Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Thu, 10 Sep 2015 12:22:57 +0100 Subject: [PATCH] Import patches-unapplied version 2.343 to ubuntu/wily-proposed Imported using git-ubuntu import. Changelog parent: 69a5210a5346c66ab135dad2cb19014094c2e1ab New changelog entries: [ Oliver Grawert ] * add empty "extrausers" equivalents for subuid and subgid files, else adduser falls over in interactive mode when trying to write to them. [ Iain Lane ] * live-build/ubuntu-touch/hooks/03-etc-writable.chroot: Set up /etc/whoopsie too. (LP: #1437633) --- debian/changelog | 12 ++++++++++++ live-build/ubuntu-core/hooks/01-setup_user.chroot | 2 ++ .../ubuntu-desktop-next/hooks/01-setup_user.chroot | 2 ++ live-build/ubuntu-touch/hooks/01-setup_user.chroot | 2 ++ live-build/ubuntu-touch/hooks/03-etc-writable.chroot | 2 +- 5 files changed, 19 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e339b53f..78b42875 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +livecd-rootfs (2.343) wily; urgency=medium + + [ Oliver Grawert ] + * add empty "extrausers" equivalents for subuid and subgid files, else + adduser falls over in interactive mode when trying to write to them. + + [ Iain Lane ] + * live-build/ubuntu-touch/hooks/03-etc-writable.chroot: Set up /etc/whoopsie + too. (LP: #1437633) + + -- Iain Lane Thu, 10 Sep 2015 12:22:57 +0100 + livecd-rootfs (2.342) wily; urgency=medium * ubuntu-touch, ubuntu-desktop-next: drop systemd-journal-remote from group diff --git a/live-build/ubuntu-core/hooks/01-setup_user.chroot b/live-build/ubuntu-core/hooks/01-setup_user.chroot index 967c6a1b..e9f3e2b1 100755 --- a/live-build/ubuntu-core/hooks/01-setup_user.chroot +++ b/live-build/ubuntu-core/hooks/01-setup_user.chroot @@ -30,6 +30,8 @@ sed -i "/^$USER/d" /etc/group sed -i "/^$USER/d" /etc/passwd sed -i "/^$USER/d" /etc/shadow sed -i "/^$USER/d" /etc/gshadow +touch /var/lib/extrausers/subuid +touch /var/lib/extrausers/subgid # needs to run *after* the user was moved out to /var/lib/extrausers echo "I: set user $USER password to $USER" diff --git a/live-build/ubuntu-desktop-next/hooks/01-setup_user.chroot b/live-build/ubuntu-desktop-next/hooks/01-setup_user.chroot index 84e07272..26564c3c 100755 --- a/live-build/ubuntu-desktop-next/hooks/01-setup_user.chroot +++ b/live-build/ubuntu-desktop-next/hooks/01-setup_user.chroot @@ -35,6 +35,8 @@ sed -i "/^$USER/d" /etc/group sed -i "/^$USER/d" /etc/passwd sed -i "/^$USER/d" /etc/shadow sed -i "/^$USER/d" /etc/gshadow +touch /var/lib/extrausers/subuid +touch /var/lib/extrausers/subgid # needs to run *after* the user was moved out to /var/lib/extrausers echo "I: set user $USER password to $USER" diff --git a/live-build/ubuntu-touch/hooks/01-setup_user.chroot b/live-build/ubuntu-touch/hooks/01-setup_user.chroot index 966f5d3e..1be0534d 100755 --- a/live-build/ubuntu-touch/hooks/01-setup_user.chroot +++ b/live-build/ubuntu-touch/hooks/01-setup_user.chroot @@ -32,6 +32,8 @@ sed -i "/^$USER/d" /etc/group sed -i "/^$USER/d" /etc/passwd sed -i "/^$USER/d" /etc/shadow sed -i "/^$USER/d" /etc/gshadow +touch /var/lib/extrausers/subuid +touch /var/lib/extrausers/subgid # Prevent the system user from being presented in the greeter by bumping MIN_UID sed -i 's/^\(UID_MIN\s\+\).*/\11002/g' /etc/login.defs diff --git a/live-build/ubuntu-touch/hooks/03-etc-writable.chroot b/live-build/ubuntu-touch/hooks/03-etc-writable.chroot index c58b4bdd..22626c24 100755 --- a/live-build/ubuntu-touch/hooks/03-etc-writable.chroot +++ b/live-build/ubuntu-touch/hooks/03-etc-writable.chroot @@ -5,7 +5,7 @@ set -x mkdir -p /etc/writable touch /etc/writable/machine-info -for f in timezone localtime machine-info hostname; do +for f in timezone localtime machine-info hostname whoopsie; do if [ -e /etc/$f ]; then echo "I: Moving /etc/$f to /etc/writable/" mv /etc/$f /etc/writable/$f