mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-05-17 13:51:32 +00:00
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)
This commit is contained in:
parent
69a5210a53
commit
808414beec
12
debian/changelog
vendored
12
debian/changelog
vendored
@ -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 <iain@orangesquash.org.uk> Thu, 10 Sep 2015 12:22:57 +0100
|
||||||
|
|
||||||
livecd-rootfs (2.342) wily; urgency=medium
|
livecd-rootfs (2.342) wily; urgency=medium
|
||||||
|
|
||||||
* ubuntu-touch, ubuntu-desktop-next: drop systemd-journal-remote from group
|
* ubuntu-touch, ubuntu-desktop-next: drop systemd-journal-remote from group
|
||||||
|
@ -30,6 +30,8 @@ sed -i "/^$USER/d" /etc/group
|
|||||||
sed -i "/^$USER/d" /etc/passwd
|
sed -i "/^$USER/d" /etc/passwd
|
||||||
sed -i "/^$USER/d" /etc/shadow
|
sed -i "/^$USER/d" /etc/shadow
|
||||||
sed -i "/^$USER/d" /etc/gshadow
|
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
|
# needs to run *after* the user was moved out to /var/lib/extrausers
|
||||||
echo "I: set user $USER password to $USER"
|
echo "I: set user $USER password to $USER"
|
||||||
|
@ -35,6 +35,8 @@ sed -i "/^$USER/d" /etc/group
|
|||||||
sed -i "/^$USER/d" /etc/passwd
|
sed -i "/^$USER/d" /etc/passwd
|
||||||
sed -i "/^$USER/d" /etc/shadow
|
sed -i "/^$USER/d" /etc/shadow
|
||||||
sed -i "/^$USER/d" /etc/gshadow
|
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
|
# needs to run *after* the user was moved out to /var/lib/extrausers
|
||||||
echo "I: set user $USER password to $USER"
|
echo "I: set user $USER password to $USER"
|
||||||
|
@ -32,6 +32,8 @@ sed -i "/^$USER/d" /etc/group
|
|||||||
sed -i "/^$USER/d" /etc/passwd
|
sed -i "/^$USER/d" /etc/passwd
|
||||||
sed -i "/^$USER/d" /etc/shadow
|
sed -i "/^$USER/d" /etc/shadow
|
||||||
sed -i "/^$USER/d" /etc/gshadow
|
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
|
# 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
|
sed -i 's/^\(UID_MIN\s\+\).*/\11002/g' /etc/login.defs
|
||||||
|
@ -5,7 +5,7 @@ set -x
|
|||||||
mkdir -p /etc/writable
|
mkdir -p /etc/writable
|
||||||
touch /etc/writable/machine-info
|
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
|
if [ -e /etc/$f ]; then
|
||||||
echo "I: Moving /etc/$f to /etc/writable/"
|
echo "I: Moving /etc/$f to /etc/writable/"
|
||||||
mv /etc/$f /etc/writable/$f
|
mv /etc/$f /etc/writable/$f
|
||||||
|
Loading…
x
Reference in New Issue
Block a user