diff --git a/debian/changelog b/debian/changelog index 827ca39f..8262eadd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ livecd-rootfs (2.233) UNRELEASED; urgency=medium + [ Colin Watson ] * live-build/auto/config: Add configuration for new kubuntu-plasma5 flavour. + [ James Hunt ] + * ubuntu-core: Run setup hooks as done for ubuntu-touch. + -- Colin Watson Thu, 31 Jul 2014 10:27:42 +0100 livecd-rootfs (2.232) utopic; urgency=medium diff --git a/live-build/auto/config b/live-build/auto/config index 3284ac50..743ec985 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -561,8 +561,8 @@ EOF fi ;; - ubuntu-touch) - cp -af /usr/share/livecd-rootfs/live-build/ubuntu-touch/* \ + ubuntu-touch|ubuntu-core) + cp -af /usr/share/livecd-rootfs/live-build/${PROJECT}/* \ config/ ;; esac diff --git a/live-build/ubuntu-core/hooks/01-setup_user.chroot b/live-build/ubuntu-core/hooks/01-setup_user.chroot new file mode 100755 index 00000000..a8689e3b --- /dev/null +++ b/live-build/ubuntu-core/hooks/01-setup_user.chroot @@ -0,0 +1,12 @@ +#!/bin/sh -x + +USER=ubuntu +UGID=1000 + +echo "I: creating default user $USER" +adduser --gecos $USER --disabled-login $USER --uid $UGID + +echo "I: set user $USER password to $USER" +echo "$USER:$USER" | chpasswd + +chown -R $UGID:$UGID /home/$USER diff --git a/live-build/ubuntu-core/hooks/02-add_user_to_groups.chroot b/live-build/ubuntu-core/hooks/02-add_user_to_groups.chroot new file mode 100755 index 00000000..2e48e233 --- /dev/null +++ b/live-build/ubuntu-core/hooks/02-add_user_to_groups.chroot @@ -0,0 +1,8 @@ +#!/bin/sh -x + +USER=ubuntu + +DEFGROUPS="sudo" + +echo "I: add $USER to ($DEFGROUPS) group(s)" +usermod -a -G ${DEFGROUPS} ${USER} diff --git a/live-build/ubuntu-core/hooks/99-remove-documentation.chroot b/live-build/ubuntu-core/hooks/99-remove-documentation.chroot new file mode 100755 index 00000000..593d8a87 --- /dev/null +++ b/live-build/ubuntu-core/hooks/99-remove-documentation.chroot @@ -0,0 +1,11 @@ +#!/bin/bash + +# remove-documentation: Remove unnecessary documentation to reduce disk usage +# +# Author: Alex Chiang +# Date : November 9, 2010 + +echo "Removing documentation..." +find /usr/share/doc -depth -type f ! -name copyright|xargs rm || true +find /usr/share/doc -empty|xargs rmdir || true +rm -rf /usr/share/man /usr/share/groff /usr/share/info /usr/share/lintian /usr/share/linda /var/cache/man