From de8c39ff981a1b43ce14d10063344803a9f5c06b Mon Sep 17 00:00:00 2001 From: James Hunt Date: Tue, 29 Jul 2014 21:21:41 +0100 Subject: [PATCH 1/2] * ubuntu-core: Run setup hooks as done for ubuntu-touch. --- live-build/auto/config | 4 ++-- live-build/ubuntu-core/hooks/01-setup_user.chroot | 12 ++++++++++++ .../ubuntu-core/hooks/99-remove-documentation.chroot | 11 +++++++++++ 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100755 live-build/ubuntu-core/hooks/01-setup_user.chroot create mode 100755 live-build/ubuntu-core/hooks/99-remove-documentation.chroot diff --git a/live-build/auto/config b/live-build/auto/config index bd5eaca1..474aa641 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -547,8 +547,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/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 From 60a334d0cf4fdc15735df3f07a8e4a055bf4d8f3 Mon Sep 17 00:00:00 2001 From: James Hunt Date: Tue, 29 Jul 2014 21:45:11 +0100 Subject: [PATCH 2/2] * ubuntu-core: Ensure user can use sudo. --- live-build/ubuntu-core/hooks/02-add_user_to_groups.chroot | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100755 live-build/ubuntu-core/hooks/02-add_user_to_groups.chroot 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}