Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-15 21:01:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge from trunk

Browse Source
This commit is contained in:
Michael Terry 2013-08-14 12:50:48 -04:00
commit 3e6067b0ca
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
debian/changelog vendored
View File

@ -1,3 +1,18 @@
livecd-rootfs (2.173) saucy; urgency=low
[Michael Terry]
* Add phablet user to nopasswdlogin group on Touch images
* Switch min uid to 1002 to prevent system users from showing in
the greeter on Touch images
-- Oliver Grawert <ogra@ubuntu.com> Wed, 14 Aug 2013 11:01:47 +0200
livecd-rootfs (2.172) saucy; urgency=low
* Reenabling click package installation hook.
-- Sergio Schvezov <sergio.schvezov@canonical.com> Sun, 11 Aug 2013 19:03:53 -0300
livecd-rootfs (2.171) saucy; urgency=low livecd-rootfs (2.171) saucy; urgency=low
* seems unlike my local build the buildd doesnt get along with links, use * seems unlike my local build the buildd doesnt get along with links, use

5
live-build/ubuntu-touch/hooks/01-setup_user.chroot
View File

@ -9,11 +9,14 @@ adduser --gecos $USER --disabled-login $USER --uid $UGID
echo "I: set user $USER password to $USER" echo "I: set user $USER password to $USER"
echo "$USER:$USER" | chpasswd echo "$USER:$USER" | chpasswd
echo "I: allowing user to log in without password"
gpasswd -a $USER nopasswdlogin
adduser --gecos system --no-create-home --disabled-login --disabled-password system --uid 1000 adduser --gecos system --no-create-home --disabled-login --disabled-password system --uid 1000
adduser --gecos radio --no-create-home --disabled-login --disabled-password radio --uid 1001 adduser --gecos radio --no-create-home --disabled-login --disabled-password radio --uid 1001
# 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\+\).*/\11001/g' /etc/login.defs sed -i 's/^\(UID_MIN\s\+\).*/\11002/g' /etc/login.defs
mkdir -p /home/$USER/Music mkdir -p /home/$USER/Music
mkdir -p /home/$USER/Pictures mkdir -p /home/$USER/Pictures

6
live-build/ubuntu-touch/hooks/60-install-click.chroot
View File

@ -1,11 +1,5 @@
#!/bin/sh #!/bin/sh
cat <<EOF
Click package installation temporarily disabled until desktop/AppArmor
integration is all working properly.
EOF
exit 0
set -e set -e
echo "Setting up click packages" echo "Setting up click packages"