Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-11-04 10:54:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Import patches-unapplied version 2.276 to ubuntu/vivid-proposed

Browse Source 
Imported using git-ubuntu import.

Changelog parent: 46882a81aaffafffbc08bc47674c5f2f83e0823c

New changelog entries:
  [ Mathieu Trudel-Lapierre ]
  * live-build/auto/config: add config for Ubuntu MATE.
  [ Michael Vogt ]
  * use generic kernel for all ubuntu-core system-image
  * live-build/ubuntu-core/hooks/01-setup_user.chroot:
    - run chpasswd after user moved into /var/lib/extrausers
  * live-build/ubuntu-core/hooks/01-setup_user.chroot:
    - run with -e
This commit is contained in:
Mathieu Trudel-Lapierre 2015-01-28 11:03:08 -05:00 committed by usd-importer
parent 46882a81aa
commit 6583eeab58
3 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
debian/changelog vendored
View File

@ -1,3 +1,17 @@
livecd-rootfs (2.276) vivid; urgency=medium
[ Mathieu Trudel-Lapierre ]
* live-build/auto/config: add config for Ubuntu MATE.
[ Michael Vogt ]
* use generic kernel for all ubuntu-core system-image
* live-build/ubuntu-core/hooks/01-setup_user.chroot:
- run chpasswd after user moved into /var/lib/extrausers
* live-build/ubuntu-core/hooks/01-setup_user.chroot:
- run with -e
-- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Wed, 28 Jan 2015 11:03:08 -0500
livecd-rootfs (2.275+ppa2) vivid; urgency=medium
* live-build/ubuntu-core/hooks/04-configure_network.chroot: use

19
live-build/auto/config
View File

@ -149,6 +149,10 @@ if [ "$PREINSTALLED" = "true" ] && [ "$SUBPROJECT" != "wubi" ]; then
add_package live oem-config-gtk ubiquity-frontend-gtk
add_package live ubiquity-slideshow-xubuntu
;;
ubuntu-mate)
add_package live oem-config-gtk ubiquity-frontend-gtk
add_package live ubiquity-slideshow-ubuntu-mate
;;
ubuntu-server)
add_package live oem-config-debconf ubiquity-frontend-debconf
;;
@ -306,6 +310,18 @@ case $PROJECT in
COMPONENTS='main restricted universe'
;;
ubuntu-mate)
add_task install minimal standard ubuntu-mate-core ubuntu-mate-desktop
LIVE_TASK='ubuntu-mate-live'
case $ARCH in
amd64) add_package live linux-signed-generic ;;
esac
COMPONENTS='main restricted universe multiverse'
# The Ubuntu MATE STRUCTURE file has "feature
# no-follow-recommends". Mirror this.
export APT_OPTIONS="--yes --no-install-recommends"
;;
ubuntustudio-dvd)
add_task install minimal standard ubuntustudio-desktop ubuntustudio-audio ubuntustudio-font-meta ubuntustudio-graphics ubuntustudio-video ubuntustudio-publishing ubuntustudio-photography
COMPONENTS='main restricted universe multiverse'
@ -367,14 +383,13 @@ case $PROJECT in
esac
# generic kernel etc
KERNEL_FLAVOURS=generic
case $ARCH in
i386|amd64)
add_package install grub-pc
KERNEL_FLAVOURS=virtual
;;
armhf)
add_package install flash-kernel u-boot-tools
KERNEL_FLAVOURS=generic
;;
esac
OPTS="${OPTS:+$OPTS }--linux-packages=linux-image"

10
live-build/ubuntu-core/hooks/01-setup_user.chroot
View File

@ -1,14 +1,13 @@
#!/bin/sh -x
set -e
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
# Enable libnss-extrusers
@ -31,3 +30,8 @@ sed -i "/^$USER/d" /etc/group
sed -i "/^$USER/d" /etc/passwd
sed -i "/^$USER/d" /etc/shadow
sed -i "/^$USER/d" /etc/gshadow
# needs to run *after* the user was moved out to /var/lib/extrausers
echo "I: set user $USER password to $USER"
echo "$USER:$USER" | chpasswd