mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-02-10 20:57:29 +00:00
Import patches-unapplied version 2.275+ppa2 to ubuntu/vivid-proposed
Imported using git-ubuntu import. Changelog parent: e9c37a48e9398794be88d0f437b5f0b287e29180 New changelog entries: * live-build/ubuntu-core/hooks/04-configure_network.chroot: use 'allow-hotplug' for the network config, not 'auto', to work around systemd behavior that causes 'auto' to delay the rest of the boot when DHCP is not available on the network. * live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early: - port static uid/gid setup from ubuntu-touch * live-build/ubuntu-core/hooks/15-pycompile-snappy.chroot: - byte compile .pyc files for snappy
This commit is contained in:
parent
e9c37a48e9
commit
46882a81aa
18
debian/changelog
vendored
18
debian/changelog
vendored
@ -1,3 +1,21 @@
|
||||
livecd-rootfs (2.275+ppa2) vivid; urgency=medium
|
||||
|
||||
* live-build/ubuntu-core/hooks/04-configure_network.chroot: use
|
||||
'allow-hotplug' for the network config, not 'auto', to work around
|
||||
systemd behavior that causes 'auto' to delay the rest of the boot when
|
||||
DHCP is not available on the network.
|
||||
|
||||
-- Steve Langasek <steve.langasek@ubuntu.com> Wed, 14 Jan 2015 22:49:43 -0800
|
||||
|
||||
livecd-rootfs (2.275+ppa1) vivid; urgency=low
|
||||
|
||||
* live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early:
|
||||
- port static uid/gid setup from ubuntu-touch
|
||||
* live-build/ubuntu-core/hooks/15-pycompile-snappy.chroot:
|
||||
- byte compile .pyc files for snappy
|
||||
|
||||
-- Michael Vogt <michael.vogt@ubuntu.com> Wed, 07 Jan 2015 09:36:11 +0100
|
||||
|
||||
livecd-rootfs (2.275) vivid; urgency=low
|
||||
|
||||
[ Michael Vogt ]
|
||||
|
@ -10,3 +10,24 @@ echo "I: set user $USER password to $USER"
|
||||
echo "$USER:$USER" | chpasswd
|
||||
|
||||
chown -R $UGID:$UGID /home/$USER
|
||||
|
||||
# Enable libnss-extrusers
|
||||
sed -i 's/^group:.*compat/\0 extrausers/' /etc/nsswitch.conf
|
||||
sed -i 's/^passwd:.*compat/\0 extrausers/' /etc/nsswitch.conf
|
||||
sed -i 's/^shadow:.*compat/\0 extrausers/' /etc/nsswitch.conf
|
||||
|
||||
# Move user from /etc to extrausers location
|
||||
grep "^$USER" /etc/group >> /var/lib/extrausers/group
|
||||
grep "^$USER" /etc/passwd >> /var/lib/extrausers/passwd
|
||||
grep "^$USER" /etc/shadow >> /var/lib/extrausers/shadow
|
||||
grep "^$USER" /etc/gshadow >> /var/lib/extrausers/gshadow
|
||||
chmod 0644 /var/lib/extrausers/group
|
||||
chmod 0644 /var/lib/extrausers/passwd
|
||||
chmod 0640 /var/lib/extrausers/shadow
|
||||
chmod 0640 /var/lib/extrausers/gshadow
|
||||
chown root:shadow /var/lib/extrausers/shadow
|
||||
chown root:shadow /var/lib/extrausers/gshadow
|
||||
sed -i "/^$USER/d" /etc/group
|
||||
sed -i "/^$USER/d" /etc/passwd
|
||||
sed -i "/^$USER/d" /etc/shadow
|
||||
sed -i "/^$USER/d" /etc/gshadow
|
||||
|
@ -4,6 +4,6 @@ if=eth0
|
||||
|
||||
# Manually configure the first ethernet device
|
||||
cat >/etc/network/interfaces.d/"$if"<<EOT
|
||||
auto $if
|
||||
allow-hotplug $if
|
||||
iface $if inet dhcp
|
||||
EOT
|
||||
|
6
live-build/ubuntu-core/hooks/15-pycompile-snappy.chroot
Normal file
6
live-build/ubuntu-core/hooks/15-pycompile-snappy.chroot
Normal file
@ -0,0 +1,6 @@
|
||||
#!/bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
# ensure python create the byte .pyc files for snappy
|
||||
snappy -v
|
Loading…
x
Reference in New Issue
Block a user