From e226eb633117739f99ff23b5e6898e4add8e4686 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 16 Jan 2015 18:29:19 +0100 Subject: [PATCH] * live-build/ubuntu-core/hooks/01-setup_user.chroot: - run with -e --- debian/changelog | 7 +++++++ live-build/ubuntu-core/hooks/01-setup_user.chroot | 9 ++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index e798bd5a..ad589f9f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.275+ppa3) vivid; urgency=low + + * live-build/ubuntu-core/hooks/01-setup_user.chroot: + - run with -e + + -- Michael Vogt Fri, 16 Jan 2015 18:28:10 +0100 + livecd-rootfs (2.275+ppa2) vivid; urgency=medium * live-build/ubuntu-core/hooks/04-configure_network.chroot: use diff --git a/live-build/ubuntu-core/hooks/01-setup_user.chroot b/live-build/ubuntu-core/hooks/01-setup_user.chroot index c4a35f05..558fe693 100755 --- a/live-build/ubuntu-core/hooks/01-setup_user.chroot +++ b/live-build/ubuntu-core/hooks/01-setup_user.chroot @@ -1,16 +1,19 @@ #!/bin/sh -x +set -e + USER=ubuntu UGID=1000 echo "I: creating default user $USER" -adduser --gecos $USER --disabled-login $USER --uid $UGID +adduser --gecos $USER --disabled-password $USER --uid $UGID + +chown -R $UGID:$UGID /home/$USER +passwd -d $USER 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