From 7c1c7a80c2eba1fd876808bd216f1b550c159aaa Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Thu, 21 Dec 2017 11:00:22 +1300 Subject: [PATCH 01/43] enable networkd for live-server systems the logic for doing this is the same as why it is done for cloud-images, for which see http://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk/revision/1520 I think this behaviour is a bug in cloud-init (see lp:#1737630) but this is a good workaround in the mean time --- debian/changelog | 6 ++++++ .../system/multi-user.target.wants/systemd-networkd.service | 1 + .../systemd-networkd-wait-online.service | 1 + .../system/sockets.target.wants/systemd-networkd.socket | 1 + 4 files changed, 9 insertions(+) create mode 120000 live-build/ubuntu-server/includes.chroot/etc/systemd/system/multi-user.target.wants/systemd-networkd.service create mode 120000 live-build/ubuntu-server/includes.chroot/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service create mode 120000 live-build/ubuntu-server/includes.chroot/etc/systemd/system/sockets.target.wants/systemd-networkd.socket diff --git a/debian/changelog b/debian/changelog index 26cf864e..69fa6856 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.488) UNRELEASED; urgency=medium + + * Enable systemd-networkd by default for live-server installs. + + -- Michael Hudson-Doyle Thu, 21 Dec 2017 10:59:50 +1300 + livecd-rootfs (2.487) bionic; urgency=medium * Drop android-tools-fsutils dependency, and instead install it on diff --git a/live-build/ubuntu-server/includes.chroot/etc/systemd/system/multi-user.target.wants/systemd-networkd.service b/live-build/ubuntu-server/includes.chroot/etc/systemd/system/multi-user.target.wants/systemd-networkd.service new file mode 120000 index 00000000..3c55b243 --- /dev/null +++ b/live-build/ubuntu-server/includes.chroot/etc/systemd/system/multi-user.target.wants/systemd-networkd.service @@ -0,0 +1 @@ +/lib/systemd/system/systemd-networkd.service \ No newline at end of file diff --git a/live-build/ubuntu-server/includes.chroot/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service b/live-build/ubuntu-server/includes.chroot/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service new file mode 120000 index 00000000..3b627c5c --- /dev/null +++ b/live-build/ubuntu-server/includes.chroot/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service @@ -0,0 +1 @@ +/lib/systemd/system/systemd-networkd-wait-online.service \ No newline at end of file diff --git a/live-build/ubuntu-server/includes.chroot/etc/systemd/system/sockets.target.wants/systemd-networkd.socket b/live-build/ubuntu-server/includes.chroot/etc/systemd/system/sockets.target.wants/systemd-networkd.socket new file mode 120000 index 00000000..bcfcdbac --- /dev/null +++ b/live-build/ubuntu-server/includes.chroot/etc/systemd/system/sockets.target.wants/systemd-networkd.socket @@ -0,0 +1 @@ +/lib/systemd/system/systemd-networkd.socket \ No newline at end of file From 4cbb91b55fe22f994c604b396fd355ae8d23ec98 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Thu, 4 Jan 2018 09:37:28 +1300 Subject: [PATCH 02/43] releasing package livecd-rootfs version 2.488 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 69fa6856..22f5fd29 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -livecd-rootfs (2.488) UNRELEASED; urgency=medium +livecd-rootfs (2.488) bionic; urgency=medium * Enable systemd-networkd by default for live-server installs. - -- Michael Hudson-Doyle Thu, 21 Dec 2017 10:59:50 +1300 + -- Michael Hudson-Doyle Thu, 04 Jan 2018 09:36:56 +1300 livecd-rootfs (2.487) bionic; urgency=medium From 07873ec5285348165fd9f494cd7e09d7b12f4481 Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Thu, 4 Jan 2018 12:11:46 +0000 Subject: [PATCH 03/43] Support seeding of snaps We run germinate during configure, and read from each resulting .snaps file (expanded from STRUCTURE) to find out which snaps to seed. This is written to config/seeded-snaps, which is read during build to download each one. --- live-build/auto/build | 65 ++++++++++++------------- live-build/auto/config | 106 ++++++++++++++++++++++++----------------- 2 files changed, 93 insertions(+), 78 deletions(-) diff --git a/live-build/auto/build b/live-build/auto/build index f9d05e2c..31f4b8a7 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -42,7 +42,7 @@ preinstall_snaps() { chroot chroot sh -c " set -x; cd /var/lib/snapd/seed; - SNAPPY_STORE_NO_CDN=1 snap download \"$snap\"" + SNAPPY_STORE_NO_CDN=1 snap download \"${snap%/*}\"" done lb chroot_resolv remove @@ -55,12 +55,14 @@ snaps: file: ${CORE_SNAP} EOF for snap in "$@"; do + snap_name=${snap%/*} cat <> chroot/var/lib/snapd/seed/seed.yaml - - name: $snap + - name: ${snap_name} channel: stable EOF + case ${snap} in */classic) echo " classic: true" >> chroot/var/lib/snapd/seed/seed.yaml;; esac echo -n " file: " >> chroot/var/lib/snapd/seed/seed.yaml - (cd chroot/var/lib/snapd/seed; ls -1 ${snap}_*.snap) \ + (cd chroot/var/lib/snapd/seed; ls -1 ${snap_name}_*.snap) \ >> chroot/var/lib/snapd/seed/seed.yaml done @@ -367,40 +369,33 @@ deb file:/var/lib/preinstalled-pool/ $LB_DISTRIBUTION $LB_PARENT_ARCHIVE_AREAS rm chroot/etc/apt/sources.list.preinstall chroot/etc/apt/sources.list.orig fi case $PROJECT:$SUBPROJECT in - ubuntu-server:live|ubuntu-mate:*) - assertions_dir="chroot/var/lib/snapd/seed/assertions" - model_assertion="$assertions_dir/generic-classic.model" - account_key_assertion="$assertions_dir/generic.account-key" - account_assertion="$assertions_dir/generic.account" - - mkdir -p "$assertions_dir" - snap known --remote model series=16 \ - model=generic-classic brand-id=generic \ - > "$model_assertion" - account_key=$(sed -n -e's/sign-key-sha3-384: //p' \ - < "$model_assertion") - - snap known --remote account-key \ - public-key-sha3-384="$account_key" \ - > "$account_key_assertion" - account=$(sed -n -e's/account-id: //p' \ - < "$account_key_assertion") - - snap known --remote account account-id=generic \ - > "$account_assertion" - ;; - esac - - # FIXME: this should not be a hard-coded list in this script; this - # is an interim solution for 17.10. - case $PROJECT:$SUBPROJECT in - ubuntu-mate:*) - SNAP_LIST=pulsemixer + *) + if [ -e "config/seeded-snaps" ]; then + assertions_dir="chroot/var/lib/snapd/seed/assertions" + model_assertion="$assertions_dir/generic-classic.model" + account_key_assertion="$assertions_dir/generic.account-key" + account_assertion="$assertions_dir/generic.account" + + mkdir -p "$assertions_dir" + snap known --remote model series=16 \ + model=generic-classic brand-id=generic \ + > "$model_assertion" + account_key=$(sed -n -e's/sign-key-sha3-384: //p' \ + < "$model_assertion") + + snap known --remote account-key \ + public-key-sha3-384="$account_key" \ + > "$account_key_assertion" + account=$(sed -n -e's/account-id: //p' \ + < "$account_key_assertion") + + snap known --remote account account-id=generic \ + > "$account_assertion" + snap_list=$(cat config/seeded-snaps) + preinstall_snaps $snap_list + fi ;; esac - if [ -n "$SNAP_LIST" ]; then - preinstall_snaps $SNAP_LIST - fi if [ "$PROJECT" = "ubuntu-touch" ] || [ "$PROJECT" = "ubuntu-touch-custom" ]; then if [ "$ARCH" = "armhf" ]; then diff --git a/live-build/auto/config b/live-build/auto/config index 8c749ec6..f6ceea42 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -254,13 +254,76 @@ if [ "${SUBPROJECT:-}" = minimized ]; then OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal --linux-packages=linux-image" fi +# cribbed from cdimage, perhaps this should be a small helper script in germinate? +add_inheritance () { + case " $inherit " in + *" $1 "*) + ;; + *) + inherit="${inherit:+$inherit }$1" + ;; + esac +} + +expand_inheritance () { + for seed in $(grep "^$1:" config/germinate-output/structure | cut -d: -f2); do + expand_inheritance "$seed" + done + add_inheritance "$1" +} + +inheritance () { + inherit= + expand_inheritance "$1" + echo "$inherit" +} + +mkdir -p config/germinate-output +case $PROJECT in + kubuntu-active*) + SEED=kubuntu-active.$SUITE + ;; + kubuntu*) + SEED=kubuntu.$SUITE + ;; + xubuntu*) + SEED=xubuntu.$SUITE + ;; + *) + SEED=ubuntu.$SUITE + ;; +esac + +if ! [ -e config/germinate-output/structure ]; then + echo "Running germinate..." + (cd config/germinate-output && germinate --no-rdepends --no-installer \ + -S $SEEDMIRROR -m $MIRROR -d $SUITE -s $SEED \ + ${COMPONENTS:+-c "$COMPONENTS"} -a $ARCH) +fi + case $PROJECT in ubuntu|ubuntu-dvd) add_task install minimal standard ubuntu-desktop LIVE_TASK='ubuntu-live' + BASE_SEED='desktop' + SEEDS_EXPANDED=$(inheritance ${BASE_SEED}) case $ARCH in amd64) add_package live $SIGNED_KERNEL_PACKAGE ;; esac + for seed in ${SEEDS_EXPANDED}; do + echo "snap: considering ${seed}" + file=config/germinate-output/${seed}.snaps + [ -e "${file}" ] || continue + # extract the first column (snap package name) from germinate's output + # translate the human-readable "foo (classic)" into a + # more machine readable "foo/classic" + seed_snaps=$(sed -rn '1,/-----/d;/-----/,$d; s/(.*) \|.*/\1/; s, \(classic\),/classic,; p' "${file}") + for snap in ${seed_snaps}; do + echo "snap: found ${snap}" + ALL_SNAPS="${ALL_SNAPS:+${ALL_SNAPS} }${snap}" + done + done + echo "${ALL_SNAPS}" > config/seeded-snaps ;; ubuntu-desktop-next) @@ -933,51 +996,8 @@ case ${SUBPROJECT:-} in ;; esac -# cribbed from cdimage, perhaps this should be a small helper script in germinate? -add_inheritance () { - case " $inherit " in - *" $1 "*) - ;; - *) - inherit="${inherit:+$inherit }$1" - ;; - esac -} - -expand_inheritance () { - for seed in $(grep "^$1:" config/germinate-output/structure | cut -d: -f2); do - expand_inheritance "$seed" - done - add_inheritance "$1" -} - -inheritance () { - inherit= - expand_inheritance "$1" - echo "$inherit" -} - if [ "$PREINSTALLED" = "true" ]; then if [ -n "$PREINSTALL_POOL_SEEDS" ]; then - mkdir -p config/germinate-output - case $PROJECT in - kubuntu-active*) - SEED=kubuntu-active.$SUITE - ;; - kubuntu*) - SEED=kubuntu.$SUITE - ;; - xubuntu*) - SEED=xubuntu.$SUITE - ;; - *) - SEED=ubuntu.$SUITE - ;; - esac - (cd config/germinate-output && germinate --no-rdepends --no-installer \ - -S $SEEDMIRROR -m $MIRROR -d $SUITE -s $SEED \ - ${COMPONENTS:+-c "$COMPONENTS"} -a $ARCH) - UNWANTED_SEEDS="${LIVE_TASK:+$LIVE_TASK }boot installer required" for i in $UNWANTED_SEEDS; do UNWANTED_SEEDS="${UNWANTED_SEEDS:+$UNWANTED_SEEDS }$(inheritance $i)" From 34dd1fb2f47f85615bdcfae519292eaf784784a8 Mon Sep 17 00:00:00 2001 From: Balint Reczey Date: Thu, 4 Jan 2018 14:37:02 +0100 Subject: [PATCH 04/43] Revert to building minimized and not minimimized images with the same ~2.2 GiB size --- live-build/auto/config | 5 ----- 1 file changed, 5 deletions(-) diff --git a/live-build/auto/config b/live-build/auto/config index 4f3304b2..1faf049b 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -717,11 +717,6 @@ echo "SUBPROJECT=\"${SUBPROJECT:-}\"" >> config/chroot echo "LB_BINARY_HOOKS=\"$BINARY_HOOKS\"" >> config/binary echo "BUILDSTAMP=\"$NOW\"" >> config/binary echo "SUBPROJECT=\"${SUBPROJECT:-}\"" >> config/binary -if [ "${SUBPROJECT:-}" = minimized ]; then - # try building minimized images in a 1GiB image but still allow overriding - # IMAGE_SIZE in lb build - echo 'IMAGE_SIZE=${IMAGE_SIZE:-'$((1024*1024*1024))'}' >> config/binary -fi case $ARCH+$SUBARCH in armhf+raspi2) From c85549a2d74fc595962d334551c86fe4bb808709 Mon Sep 17 00:00:00 2001 From: Balint Reczey Date: Thu, 4 Jan 2018 14:38:27 +0100 Subject: [PATCH 05/43] Update changelog --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 22f5fd29..c2afb8bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.489) UNRELEASED; urgency=medium + + * Revert to building minimized and not minimimized images with the same + ~2.2 GiB size + + -- Balint Reczey Thu, 04 Jan 2018 14:37:51 +0100 + livecd-rootfs (2.488) bionic; urgency=medium * Enable systemd-networkd by default for live-server installs. From 510f16b757b673d8bde094ae562976bc05d96a67 Mon Sep 17 00:00:00 2001 From: Balint Reczey Date: Fri, 5 Jan 2018 01:52:00 +0100 Subject: [PATCH 06/43] Stop suggesting partimage which is not used anymore --- debian/control | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/control b/debian/control index 65dd4cf7..c66d3901 100644 --- a/debian/control +++ b/debian/control @@ -35,7 +35,6 @@ Depends: ${misc:Depends}, vmdk-stream-converter [amd64 i386], xz-utils, zerofree -Suggests: partimage Breaks: ubuntu-defaults-builder (<< 0.32) Description: construction script for the livecd rootfs livecd-rootfs provides the script used to create the root filesystem From df89bff043ef4e57202086910fb6875edc461ebd Mon Sep 17 00:00:00 2001 From: Balint Reczey Date: Sat, 6 Jan 2018 01:26:42 +0100 Subject: [PATCH 07/43] Drop Nexus 7 support --- live-build/auto/build | 12 +----------- live-build/auto/config | 10 ---------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/live-build/auto/build b/live-build/auto/build index 89e67875..aa447bdd 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -835,7 +835,7 @@ if [ "$NUMFLAVOURS" = 1 ] && [ "$LB_LINUX_FLAVOURS" != "none" ]; then fi fi -if [ "$SUBARCH" = "ac100" ] || [ "$SUBARCH" = "nexus7" ]; then +if [ "$SUBARCH" = "ac100" ]; then # create the md5sum and size files for which we are actually doing all this md5sum $PREFIX.rootfs.tar.gz >chroot/installer.md5 wc -c $PREFIX.rootfs.tar.gz >chroot/installer.size @@ -856,16 +856,6 @@ if [ "$SUBARCH" = "ac100" ] || [ "$SUBARCH" = "nexus7" ]; then # create boot.img Chroot chroot "abootimg --create /boot/installer-${KVERS}.img -f /boot/bootimg.cfg-$SUBARCH -r /boot/initrd.img-${KVERS} -k /boot/vmlinuz-${KVERS}" - if [ "$SUBARCH" = "nexus7" ]; then - # roll the android rootfs images - mkdir -p userdata - mv $PREFIX.rootfs.tar.gz userdata/rootfs.tar.gz - apt-get -y install android-tools-fsutils - make_ext4fs -l 6G -s $PREFIX.ext4-$FLAVOUR userdata/ - mv userdata/rootfs.tar.gz $PREFIX.rootfs.tar.gz - ln -sf "$PREFIX.ext4-$FLAVOUR" "$PREFIX.ext4" - fi - # clean up lb chroot_devpts remove "$@" lb chroot_sysfs remove "$@" diff --git a/live-build/auto/config b/live-build/auto/config index 1faf049b..9abaaa65 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -642,16 +642,6 @@ case $ARCH in add_package live ac100-tarball-installer BINARY_REMOVE_LINUX=false ;; - nexus7) - COMPONENTS='main restricted universe multiverse' - add_package install zram-config abootimg - add_package install nvidia-tegra3 ubuntu-defaults-nexus7 - add_package live ac100-tarball-installer - BINARY_REMOVE_LINUX=false - mkdir -p config/preseed - echo "linux-firmware-nexus7 shared/nexus7_notice_accepted boolean true" >config/preseed/linux-firmware-nexus7.preseed.chroot - echo "d-i passwd/auto-login boolean true" >config/preseed/autologin.preseed.chroot - ;; raspi2) COMPONENTS='main restricted universe multiverse' add_package install linux-firmware-raspi2 u-boot-rpi flash-kernel u-boot-tools From c499490e55498c368cbc1fde5f01621daee3377e Mon Sep 17 00:00:00 2001 From: Balint Reczey Date: Sat, 6 Jan 2018 23:49:44 +0100 Subject: [PATCH 08/43] Update changelog --- debian/changelog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c2afb8bf..e422424e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,10 @@ livecd-rootfs (2.489) UNRELEASED; urgency=medium * Revert to building minimized and not minimimized images with the same ~2.2 GiB size + * Stop suggesting partimage which is not used anymore + * Drop Nexus 7 support - -- Balint Reczey Thu, 04 Jan 2018 14:37:51 +0100 + -- Balint Reczey Sat, 06 Jan 2018 23:49:15 +0100 livecd-rootfs (2.488) bionic; urgency=medium From e6a66dd3bf9237af909ceb4c31d16e724505cfae Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Fri, 12 Jan 2018 14:56:57 -0800 Subject: [PATCH 09/43] Add support for passing snap channel to ubuntu-core image builds. --- debian/changelog | 4 ++++ live-build/auto/build | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e422424e..b1ea42ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,14 @@ livecd-rootfs (2.489) UNRELEASED; urgency=medium + [ Balint Reczey ] * Revert to building minimized and not minimimized images with the same ~2.2 GiB size * Stop suggesting partimage which is not used anymore * Drop Nexus 7 support + [ Steve Langasek ] + * Add support for passing snap channel to ubuntu-core image builds. + -- Balint Reczey Sat, 06 Jan 2018 23:49:15 +0100 livecd-rootfs (2.488) bionic; urgency=medium diff --git a/live-build/auto/build b/live-build/auto/build index aa447bdd..6d4fbfba 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -21,8 +21,9 @@ PREFIX="livecd.$PROJECT${SUBARCH:+-$SUBARCH}" if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then # Use ubuntu-image instead of live-build + CHANNEL="${CHANNEL:-edge}" env SNAPPY_STORE_NO_CDN=1 \ - ubuntu-image -c edge $UBUNTU_IMAGE_ARGS \ + ubuntu-image -c "$CHANNEL" $UBUNTU_IMAGE_ARGS \ -o "$PREFIX".img "$PREFIX".model-assertion xz -0 -T4 "$PREFIX".img mv seed.manifest "$PREFIX".manifest From 168e2def9293216dd1a88df0fecea6c7d0a92111 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Fri, 12 Jan 2018 15:04:48 -0800 Subject: [PATCH 10/43] releasing package livecd-rootfs version 2.489 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b1ea42ab..843794e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.489) UNRELEASED; urgency=medium +livecd-rootfs (2.489) bionic; urgency=medium [ Balint Reczey ] * Revert to building minimized and not minimimized images with the same @@ -9,7 +9,7 @@ livecd-rootfs (2.489) UNRELEASED; urgency=medium [ Steve Langasek ] * Add support for passing snap channel to ubuntu-core image builds. - -- Balint Reczey Sat, 06 Jan 2018 23:49:15 +0100 + -- Steve Langasek Fri, 12 Jan 2018 15:04:42 -0800 livecd-rootfs (2.488) bionic; urgency=medium From 2ebe4ec60d43315806d357208a6159277f4e3557 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Mon, 15 Jan 2018 14:56:49 +1300 Subject: [PATCH 11/43] run subiquity on the serial console --- .../subiquity-serial.conf | 2 ++ .../systemd/system/serial-subiquity@.service | 30 +++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf create mode 100644 live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/serial-subiquity@.service diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf new file mode 100644 index 00000000..9aef8ee3 --- /dev/null +++ b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf @@ -0,0 +1,2 @@ +[Service] +ExecStartPre=/bin/systemctl start serial-subiquity@%i.service diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/serial-subiquity@.service b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/serial-subiquity@.service new file mode 100644 index 00000000..68753753 --- /dev/null +++ b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/serial-subiquity@.service @@ -0,0 +1,30 @@ +[Unit] +Description=Subiquity, the installer for Ubuntu Server %I +BindsTo=dev-%i.device +After=dev-%i.device systemd-user-sessions.service plymouth-quit-wait.service +After=rc-local.service +ConditionPathExists=!/run/subiquity/complete +StartLimitInterval=0 + +[Service] +Environment=PYTHONPATH=/usr/share/subiquity +ExecStartPre=/bin/systemctl stop serial-getty@%I +ExecStart=/sbin/agetty -n --keep-baud -l /usr/share/subiquity/subiquity-tui --login-options "--serial" 115200,38400,9600 %I $TERM +ExecStopPost=/bin/systemctl start serial-getty@%I +Type=idle +Restart=always +RestartSec=0 +UtmpIdentifier=%I +TTYPath=/dev/%I +TTYReset=yes +TTYVHangup=yes +KillMode=process +IgnoreSIGPIPE=no +SendSIGHUP=yes + +#TTYVTDisallocate=yes +#KillMode=process +#Restart=always +#StandardInput=tty-force +#StandardOutput=tty +#StandardError=tty From ec1f465e2c0ea07f7b08fb730512b01f5d1cea4b Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Tue, 16 Jan 2018 13:14:46 +1300 Subject: [PATCH 12/43] fix path in serial-subiquity@.service --- .../overlay/lib/systemd/system/serial-subiquity@.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/serial-subiquity@.service b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/serial-subiquity@.service index 68753753..9d6c8b4d 100644 --- a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/serial-subiquity@.service +++ b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/serial-subiquity@.service @@ -9,7 +9,7 @@ StartLimitInterval=0 [Service] Environment=PYTHONPATH=/usr/share/subiquity ExecStartPre=/bin/systemctl stop serial-getty@%I -ExecStart=/sbin/agetty -n --keep-baud -l /usr/share/subiquity/subiquity-tui --login-options "--serial" 115200,38400,9600 %I $TERM +ExecStart=/sbin/agetty -n --keep-baud -l /snap/bin/subiquity --login-options "--serial" 115200,38400,9600 %I $TERM ExecStopPost=/bin/systemctl start serial-getty@%I Type=idle Restart=always From 47911d3221877264b3c6ccd6d2f16fdea9081367 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Wed, 17 Jan 2018 10:53:42 +1300 Subject: [PATCH 13/43] changelog --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 843794e2..1fea6e08 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.490) UNRELEASED; urgency=medium + + * Run subiquity on any serial consoles that the user told systemd + about. + + -- Michael Hudson-Doyle Wed, 17 Jan 2018 10:53:33 +1300 + livecd-rootfs (2.489) bionic; urgency=medium [ Balint Reczey ] From d41cc70bf54b84e4c298cd883d3eeeaabfa114b5 Mon Sep 17 00:00:00 2001 From: Robert C Jennings Date: Fri, 19 Jan 2018 12:26:32 -0600 Subject: [PATCH 14/43] ubuntu-cpc: Initramfs compression should match runtime default (LP: #1744114) Cloud images created from the 'ubuntu-cpc' project use lzma initramfs compression for the initial initramfs shipped in the image; this is the default for livecd-rootfs. When a user updates the initramfs (or installs a new kernel) on a running instance created from a cloud image they will get gzip compression, which is the default shipped in initramfs-tools. With this patch the compression method used to create the initramfs in the initial cloud images will match the compression menthod used when the end-user creates/updates an initramfs, namely gzip compression. --- debian/changelog | 7 +++++++ live-build/auto/config | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 843794e2..fb46ac9c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.490) bionic; urgency=medium + + * ubuntu-cpc: Initramfs compression should match default for + update-initramfs (LP: #1744114) + + -- Robert C Jennings Thu, 18 Jan 2018 10:16:37 -0600 + livecd-rootfs (2.489) bionic; urgency=medium [ Balint Reczey ] diff --git a/live-build/auto/config b/live-build/auto/config index 9abaaa65..15788881 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -487,7 +487,8 @@ case $PROJECT in add_package install shim-signed ;; esac - OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none --initramfs-compression=none" + OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none" + INITRAMFS_COMPRESSION="none" # contains the framework definition add_package install ubuntu-core-libs @@ -583,6 +584,7 @@ case $PROJECT in OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs" OPTS="${OPTS:+$OPTS }--ext-resize-blocks=536870912 --ext-block-size=4096" OPTS="${OPTS:+$OPTS }--ext-fudge-factor=15" + INITRAMFS_COMPRESSION="gzip" ;; *) @@ -696,7 +698,7 @@ lb config noauto \ ${KERNEL_FLAVOURS:+--linux-flavours "$KERNEL_FLAVOURS"} \ --initsystem none \ --bootloader "$BOOTLOADER" \ - --initramfs-compression lzma \ + --initramfs-compression "${INITRAMFS_COMPRESSION:-lzma}" \ --cache false \ ${BOOTAPPEND_LIVE:+--bootappend-live "$BOOTAPPEND_LIVE"} \ $OPTS \ From 019d1668782d3209cd9351de97befa590b835694 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Mon, 29 Jan 2018 12:15:27 -0500 Subject: [PATCH 15/43] releasing package livecd-rootfs version 2.490 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index dbac59c8..badd9dea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -livecd-rootfs (2.490) UNRELEASED; urgency=medium +livecd-rootfs (2.490) bionic; urgency=medium * ubuntu-cpc: Initramfs compression should match default for update-initramfs (LP: #1744114) - -- Robert C Jennings Thu, 18 Jan 2018 10:16:37 -0600 + -- Robert C Jennings Mon, 29 Jan 2018 12:15:17 -0500 livecd-rootfs (2.489) bionic; urgency=medium From 26612d0b266a20efa99abbe0dca5377fd7684d3b Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Tue, 30 Jan 2018 09:44:25 +0000 Subject: [PATCH 16/43] snap: move the seeding block down, so that it is common to all flavours --- live-build/auto/config | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/live-build/auto/config b/live-build/auto/config index f6ceea42..053e31fd 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -306,24 +306,9 @@ case $PROJECT in add_task install minimal standard ubuntu-desktop LIVE_TASK='ubuntu-live' BASE_SEED='desktop' - SEEDS_EXPANDED=$(inheritance ${BASE_SEED}) case $ARCH in amd64) add_package live $SIGNED_KERNEL_PACKAGE ;; esac - for seed in ${SEEDS_EXPANDED}; do - echo "snap: considering ${seed}" - file=config/germinate-output/${seed}.snaps - [ -e "${file}" ] || continue - # extract the first column (snap package name) from germinate's output - # translate the human-readable "foo (classic)" into a - # more machine readable "foo/classic" - seed_snaps=$(sed -rn '1,/-----/d;/-----/,$d; s/(.*) \|.*/\1/; s, \(classic\),/classic,; p' "${file}") - for snap in ${seed_snaps}; do - echo "snap: found ${snap}" - ALL_SNAPS="${ALL_SNAPS:+${ALL_SNAPS} }${snap}" - done - done - echo "${ALL_SNAPS}" > config/seeded-snaps ;; ubuntu-desktop-next) @@ -654,6 +639,24 @@ case $PROJECT in ;; esac +if [ -n "${BASE_SEED}" ]; then + SEEDS_EXPANDED=$(inheritance ${BASE_SEED}) + for seed in ${SEEDS_EXPANDED}; do + echo "snap: considering ${seed}" + file=config/germinate-output/${seed}.snaps + [ -e "${file}" ] || continue + # extract the first column (snap package name) from germinate's output + # translate the human-readable "foo (classic)" into a + # more machine readable "foo/classic" + seed_snaps=$(sed -rn '1,/-----/d;/-----/,$d; s/(.*) \|.*/\1/; s, \(classic\),/classic,; p' "${file}") + for snap in ${seed_snaps}; do + echo "snap: found ${snap}" + ALL_SNAPS="${ALL_SNAPS:+${ALL_SNAPS} }${snap}" + done + done + echo "${ALL_SNAPS}" > config/seeded-snaps +fi + export APT_OPTIONS if [ "$PREINSTALLED" != "true" ] && [ "$LIVE_TASK" ]; then From 77de6a289f34c9a35b9e5b23a7637a5d46dbe676 Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Tue, 30 Jan 2018 09:51:32 +0000 Subject: [PATCH 17/43] snap: Add BASE_SEED for all desktop flavours --- live-build/auto/config | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/live-build/auto/config b/live-build/auto/config index 053e31fd..0767479a 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -305,7 +305,6 @@ case $PROJECT in ubuntu|ubuntu-dvd) add_task install minimal standard ubuntu-desktop LIVE_TASK='ubuntu-live' - BASE_SEED='desktop' case $ARCH in amd64) add_package live $SIGNED_KERNEL_PACKAGE ;; esac @@ -639,6 +638,14 @@ case $PROJECT in ;; esac +# we'll expand the base seed given here according to the STRUCTURE file, and +# then look in all of the seeds found to see which snaps are seeded +case $PROJECT in + ubuntu|kubuntu*|lubuntu*|xubuntu*|ubuntu-mate*|ubuntustudio*|ubuntukylin*|ubuntu-budgie*) + BASE_SEED='desktop' + ;; +esac + if [ -n "${BASE_SEED}" ]; then SEEDS_EXPANDED=$(inheritance ${BASE_SEED}) for seed in ${SEEDS_EXPANDED}; do From 9bd0fd192f401b471232c16b1cf2d52b16cc890d Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Tue, 30 Jan 2018 10:49:38 +0000 Subject: [PATCH 18/43] Specify seeds for all flavours too --- live-build/auto/config | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/live-build/auto/config b/live-build/auto/config index 5e24832f..bbe61a26 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -289,6 +289,21 @@ case $PROJECT in xubuntu*) SEED=xubuntu.$SUITE ;; + ubuntu-mate*) + SEED=ubuntu-mate.$SUITE + ;; + lubuntu*) + SEED=lubuntu.$SUITE + ;; + ubuntu-budgie*) + SEED=ubuntu-budgie.$SUITE + ;; + ubuntukylin*) + SEED=ubuntukylin.$SUITE + ;; + ubuntustudio*) + SEED=ubuntustudio.$SUITE + ;; *) SEED=ubuntu.$SUITE ;; From 284240feb5c0445062db8cf4d956daeba6a0e160 Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Tue, 30 Jan 2018 11:20:34 +0000 Subject: [PATCH 19/43] releasing package livecd-rootfs version 2.491 --- debian/changelog | 4 ++-- live-build/auto/config | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index b8dc1a64..162f1157 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -livecd-rootfs (2.491) UNRELEASED; urgency=medium +livecd-rootfs (2.491) bionic; urgency=medium * Support seeding of snaps, as emitted by germinate >= 2.27. - -- Iain Lane Tue, 30 Jan 2018 10:05:49 +0000 + -- Iain Lane Tue, 30 Jan 2018 11:20:28 +0000 livecd-rootfs (2.490) bionic; urgency=medium diff --git a/live-build/auto/config b/live-build/auto/config index bbe61a26..89af8489 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -5,7 +5,8 @@ rm -rf config echo "Building on $(hostname --fqdn)" -SEEDMIRROR=http://people.canonical.com/~ubuntu-archive/seeds/ +SEEDMIRROR=http://people.canonical.com/~ubuntu-archive/~laney/seeds/ +MIRROR=http://raleigh/mirrors/ubuntu/ if [ -z "$MIRROR" ]; then case $(hostname --fqdn) in bld-*.mmjgroup.com) ;; From 42a6450584afc1bb0c8240e355e152319799a5da Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Tue, 30 Jan 2018 11:51:23 +0000 Subject: [PATCH 20/43] Oops. I shouldn't reference my private stuff. --- debian/changelog | 6 ++++++ live-build/auto/config | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 162f1157..17617560 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.492) bionic; urgency=medium + + * Oops. I shouldn't reference my private stuff. + + -- Iain Lane Tue, 30 Jan 2018 11:51:19 +0000 + livecd-rootfs (2.491) bionic; urgency=medium * Support seeding of snaps, as emitted by germinate >= 2.27. diff --git a/live-build/auto/config b/live-build/auto/config index 89af8489..bbe61a26 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -5,8 +5,7 @@ rm -rf config echo "Building on $(hostname --fqdn)" -SEEDMIRROR=http://people.canonical.com/~ubuntu-archive/~laney/seeds/ -MIRROR=http://raleigh/mirrors/ubuntu/ +SEEDMIRROR=http://people.canonical.com/~ubuntu-archive/seeds/ if [ -z "$MIRROR" ]; then case $(hostname --fqdn) in bld-*.mmjgroup.com) ;; From 6ca49ecf0fb725ea24a8da25da9a417a40eb77bf Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Wed, 31 Jan 2018 21:41:32 +1300 Subject: [PATCH 21/43] remove some commented out gunk from .service files --- .../overlay/lib/systemd/system/serial-subiquity@.service | 7 ------- .../overlay/lib/systemd/system/subiquity-debug@.service | 6 ------ .../overlay/lib/systemd/system/subiquity.service | 6 ------ 3 files changed, 19 deletions(-) diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/serial-subiquity@.service b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/serial-subiquity@.service index 9d6c8b4d..d5d588ad 100644 --- a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/serial-subiquity@.service +++ b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/serial-subiquity@.service @@ -21,10 +21,3 @@ TTYVHangup=yes KillMode=process IgnoreSIGPIPE=no SendSIGHUP=yes - -#TTYVTDisallocate=yes -#KillMode=process -#Restart=always -#StandardInput=tty-force -#StandardOutput=tty -#StandardError=tty diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity-debug@.service b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity-debug@.service index 826e234d..3a7edb15 100644 --- a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity-debug@.service +++ b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity-debug@.service @@ -22,9 +22,3 @@ TTYVTDisallocate=yes KillMode=process IgnoreSIGPIPE=no SendSIGHUP=yes - -#KillMode=process -#Restart=always -#StandardInput=tty-force -#StandardOutput=tty -#StandardError=tty diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity.service b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity.service index 89d44bd2..5357f04f 100644 --- a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity.service +++ b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity.service @@ -26,9 +26,3 @@ TTYVTDisallocate=yes KillMode=process IgnoreSIGPIPE=no SendSIGHUP=yes - -#KillMode=process -#Restart=always -#StandardInput=tty-force -#StandardOutput=tty -#StandardError=tty From 9e09b3172c2ee47917382d295f9c73aa4893090e Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Wed, 31 Jan 2018 02:26:10 -0700 Subject: [PATCH 22/43] Set a default archive mirror - needed for germinate. --- debian/changelog | 6 ++++++ live-build/auto/config | 1 + 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 17617560..3bb8f3f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.493) bionic; urgency=medium + + * Set a default archive mirror - needed for germinate. + + -- Iain Lane Tue, 30 Jan 2018 15:08:23 +0000 + livecd-rootfs (2.492) bionic; urgency=medium * Oops. I shouldn't reference my private stuff. diff --git a/live-build/auto/config b/live-build/auto/config index bbe61a26..b8732884 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -30,6 +30,7 @@ if [ -z "$MIRROR" ]; then *.buildd) MIRROR=http://ftpmaster.internal/ubuntu/ SEEDMIRROR=http://archive-team.internal/seeds/ ;; + *) MIRROR=http://archive.ubuntu.com/ubuntu/ ;; esac fi From 72edc20589ebc9eca3bc26427c7a8fa605519677 Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Wed, 31 Jan 2018 09:38:05 +0000 Subject: [PATCH 23/43] Set ports/archive as appropriate for default mirror - should fix autopkgtests. --- debian/changelog | 7 +++++++ live-build/auto/config | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d91a4c82..fa82d503 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.495) UNRELEASED; urgency=medium + + * Set ports/archive as appropriate for default mirror - should fix + autopkgtests. + + -- Iain Lane Wed, 31 Jan 2018 09:37:44 +0000 + livecd-rootfs (2.494) bionic; urgency=medium * Run subiquity on any serial consoles that the user told systemd diff --git a/live-build/auto/config b/live-build/auto/config index b8732884..5a004c01 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -30,7 +30,11 @@ if [ -z "$MIRROR" ]; then *.buildd) MIRROR=http://ftpmaster.internal/ubuntu/ SEEDMIRROR=http://archive-team.internal/seeds/ ;; - *) MIRROR=http://archive.ubuntu.com/ubuntu/ ;; + *) case $ARCH in + i386|amd64) MIRROR=http://archive.ubuntu.com/ubuntu/ ;; + *) MIRROR=http://ports.ubuntu.com/ubuntu-ports ;; + esac + ;; esac fi From c41bf27806874b66368df2d8c6786f042f748eac Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Wed, 31 Jan 2018 09:38:09 +0000 Subject: [PATCH 24/43] releasing package livecd-rootfs version 2.495 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index fa82d503..68ec1d83 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -livecd-rootfs (2.495) UNRELEASED; urgency=medium +livecd-rootfs (2.495) bionic; urgency=medium * Set ports/archive as appropriate for default mirror - should fix autopkgtests. - -- Iain Lane Wed, 31 Jan 2018 09:37:44 +0000 + -- Iain Lane Wed, 31 Jan 2018 09:38:07 +0000 livecd-rootfs (2.494) bionic; urgency=medium From 2c40db69bcd38e8e07fc674ca1cc621c00b06258 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Wed, 31 Jan 2018 16:41:21 -0800 Subject: [PATCH 25/43] Update hostname matches for launchpad buildds to match current practice, fixing build failures due to LP being unable to reach people.canonical.com. --- debian/changelog | 8 ++++++++ live-build/auto/config | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 68ec1d83..83d4a056 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.496) UNRELEASED; urgency=medium + + * Update hostname matches for launchpad buildds to match current practice, + fixing build failures due to LP being unable to reach + people.canonical.com. + + -- Steve Langasek Wed, 31 Jan 2018 16:39:02 -0800 + livecd-rootfs (2.495) bionic; urgency=medium * Set ports/archive as appropriate for default mirror - should fix diff --git a/live-build/auto/config b/live-build/auto/config index 5a004c01..08c06ac0 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -27,7 +27,7 @@ if [ -z "$MIRROR" ]; then *.warthogs.hbd.com) MIRROR=http://ftpmaster.internal/ubuntu/ SEEDMIRROR=http://archive-team.internal/seeds/ ;; - *.buildd) MIRROR=http://ftpmaster.internal/ubuntu/ + *.ppa|*.scalingstack) MIRROR=http://ftpmaster.internal/ubuntu/ SEEDMIRROR=http://archive-team.internal/seeds/ ;; *) case $ARCH in From 3c4a1979cc8a815998731b8cb55996a37c979e0e Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Wed, 31 Jan 2018 16:41:26 -0800 Subject: [PATCH 26/43] releasing package livecd-rootfs version 2.496 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 83d4a056..40044189 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -livecd-rootfs (2.496) UNRELEASED; urgency=medium +livecd-rootfs (2.496) bionic; urgency=medium * Update hostname matches for launchpad buildds to match current practice, fixing build failures due to LP being unable to reach people.canonical.com. - -- Steve Langasek Wed, 31 Jan 2018 16:39:02 -0800 + -- Steve Langasek Wed, 31 Jan 2018 16:41:23 -0800 livecd-rootfs (2.495) bionic; urgency=medium From 925e470693d48a0f15e078cfd8f14a5d245c4919 Mon Sep 17 00:00:00 2001 From: Adam Conrad Date: Wed, 31 Jan 2018 20:38:11 -0700 Subject: [PATCH 27/43] Fix incorrect shell variable quoting. --- live-build/auto/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/live-build/auto/config b/live-build/auto/config index 08c06ac0..9a2cf6a9 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -878,7 +878,7 @@ EOF ;; esac -if [ $PROJECT = ubuntu-server ] && [ ${SUBPROJECT:-} != live ]; then +if [ $PROJECT = ubuntu-server ] && [ "${SUBPROJECT:-}" != live ]; then cat > config/hooks/100-remove-fstab.chroot < Date: Wed, 31 Jan 2018 21:00:49 -0700 Subject: [PATCH 28/43] * live-build/auto/config: Clean out unused hostname matches and fix indenting. * live-build/auto/config: Reinstate hostname filtering for "*.buildd", which is the correct match for non-lxd builders, and add "lp-*" for the lxd ones. * live-build/auto/config: Fix incorrect quoting causing a skipped if statement in non-live ubuntu-server builds since sometime in mid-October of last year. --- debian/changelog | 10 ++++++++++ live-build/auto/config | 19 ++++++------------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index 40044189..fa7dd6ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +livecd-rootfs (2.497) bionic; urgency=medium + + * live-build/auto/config: Clean out unused hostname matches and fix indenting. + * live-build/auto/config: Reinstate hostname filtering for "*.buildd", which + is the correct match for non-lxd builders, and add "lp-*" for the lxd ones. + * live-build/auto/config: Fix incorrect quoting causing a skipped if statement + in non-live ubuntu-server builds since sometime in mid-October of last year. + + -- Adam Conrad Wed, 31 Jan 2018 20:54:54 -0700 + livecd-rootfs (2.496) bionic; urgency=medium * Update hostname matches for launchpad buildds to match current practice, diff --git a/live-build/auto/config b/live-build/auto/config index 9a2cf6a9..3cc294e1 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -8,13 +8,6 @@ echo "Building on $(hostname --fqdn)" SEEDMIRROR=http://people.canonical.com/~ubuntu-archive/seeds/ if [ -z "$MIRROR" ]; then case $(hostname --fqdn) in - bld-*.mmjgroup.com) ;; - *.mmjgroup.com) - case $ARCH in - i386|amd64) MIRROR=http://archive.mmjgroup.com/ubuntu/ ;; - *) MIRROR=http://archive.mmjgroup.com/ubuntu-ports/ ;; - esac - ;; *.0c3.net) case $ARCH in i386|amd64) MIRROR=http://mirrors.0c3.net/ubuntu/ ;; @@ -24,17 +17,17 @@ if [ -z "$MIRROR" ]; then *.ubuntu.com) MIRROR=http://ftpmaster.internal/ubuntu/ SEEDMIRROR=http://archive-team.internal/seeds/ ;; - *.warthogs.hbd.com) MIRROR=http://ftpmaster.internal/ubuntu/ + *.buildd|lp-*) MIRROR=http://ftpmaster.internal/ubuntu/ SEEDMIRROR=http://archive-team.internal/seeds/ ;; *.ppa|*.scalingstack) MIRROR=http://ftpmaster.internal/ubuntu/ SEEDMIRROR=http://archive-team.internal/seeds/ ;; - *) case $ARCH in - i386|amd64) MIRROR=http://archive.ubuntu.com/ubuntu/ ;; - *) MIRROR=http://ports.ubuntu.com/ubuntu-ports ;; - esac - ;; + *) case $ARCH in + i386|amd64) MIRROR=http://archive.ubuntu.com/ubuntu/ ;; + *) MIRROR=http://ports.ubuntu.com/ubuntu-ports/ ;; + esac + ;; esac fi From 301fdd2e024f1c5951bf7152c320d39a035ebe81 Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Thu, 1 Feb 2018 11:52:41 +0000 Subject: [PATCH 29/43] Don't write config/seeded-snaps if no snaps have been seeded. --- debian/changelog | 6 ++++++ live-build/auto/config | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index fa7dd6ba..c937e135 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.498) UNRELEASED; urgency=medium + + * Don't write config/seeded-snaps if no snaps have been seeded. + + -- Iain Lane Thu, 01 Feb 2018 11:52:16 +0000 + livecd-rootfs (2.497) bionic; urgency=medium * live-build/auto/config: Clean out unused hostname matches and fix indenting. diff --git a/live-build/auto/config b/live-build/auto/config index 3cc294e1..1e990087 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -676,7 +676,9 @@ if [ -n "${BASE_SEED}" ]; then ALL_SNAPS="${ALL_SNAPS:+${ALL_SNAPS} }${snap}" done done - echo "${ALL_SNAPS}" > config/seeded-snaps + if [ -n "${ALL_SNAPS}" ]; then + echo "${ALL_SNAPS}" > config/seeded-snaps + fi fi export APT_OPTIONS From 8366959fd65d0539693a1c918508a20fa91e6c5e Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Thu, 1 Feb 2018 11:53:00 +0000 Subject: [PATCH 30/43] releasing package livecd-rootfs version 2.498 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c937e135..f9d22bb6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -livecd-rootfs (2.498) UNRELEASED; urgency=medium +livecd-rootfs (2.498) bionic; urgency=medium * Don't write config/seeded-snaps if no snaps have been seeded. - -- Iain Lane Thu, 01 Feb 2018 11:52:16 +0000 + -- Iain Lane Thu, 01 Feb 2018 11:52:56 +0000 livecd-rootfs (2.497) bionic; urgency=medium From d4fe705be713548b7d823f4472d0fa61b1d69c3e Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Mon, 5 Feb 2018 15:37:52 +0000 Subject: [PATCH 31/43] Stop building vagrant.box, ova, vmdk images for i386. https://trello.com/c/zhisDVTq --- live-build/ubuntu-cpc/hooks/040-vmdk-image.binary | 2 +- live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary | 4 ---- live-build/ubuntu-cpc/hooks/042-vagrant.binary | 4 ---- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/live-build/ubuntu-cpc/hooks/040-vmdk-image.binary b/live-build/ubuntu-cpc/hooks/040-vmdk-image.binary index 7c2e0e54..95b1d9a3 100755 --- a/live-build/ubuntu-cpc/hooks/040-vmdk-image.binary +++ b/live-build/ubuntu-cpc/hooks/040-vmdk-image.binary @@ -4,7 +4,7 @@ # Generate VMDK files case $ARCH in - i386|amd64) ;; + amd64) ;; *) echo "VMDK images are not supported for $ARCH yet."; exit 0;; esac diff --git a/live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary b/live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary index 801808c0..48d77789 100755 --- a/live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary +++ b/live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary @@ -18,10 +18,6 @@ case $ARCH in ovf_id=94 ovf_os_type="ubuntu64Guest" ovf_desc_bits=64 ;; - i386) - ovf_id=93 - ovf_os_type="ubuntu32Guest" - ovf_desc_bits=32 ;; *) echo "OVA images are not supported for $ARCH yet."; exit 0;; diff --git a/live-build/ubuntu-cpc/hooks/042-vagrant.binary b/live-build/ubuntu-cpc/hooks/042-vagrant.binary index d748560c..d92b7080 100755 --- a/live-build/ubuntu-cpc/hooks/042-vagrant.binary +++ b/live-build/ubuntu-cpc/hooks/042-vagrant.binary @@ -35,10 +35,6 @@ case $ARCH in ovf_id=94 ovf_os_type="ubuntu64Guest" ovf_desc_bits=64 ;; - i386) - ovf_id=93 - ovf_os_type="ubuntu32Guest" - ovf_desc_bits=32 ;; *) echo "Vagrant images are not supported for $ARCH yet." exit 0;; From 762536b5bf41caf1dec297edfc63b911efecd1b7 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Tue, 6 Feb 2018 23:37:28 -0500 Subject: [PATCH 32/43] live-build/auto/config: Take into account SUBPROJECT when setting seeded snaps, and also make sure we can work with snaps seeded in project hooks. --- debian/changelog | 7 +++++++ live-build/auto/config | 12 +++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index f9d22bb6..7844ad87 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.499) UNRELEASED; urgency=medium + + * live-build/auto/config: Take into account SUBPROJECT when setting seeded + snaps, and also make sure we can work with snaps seeded in project hooks. + + -- Mathieu Trudel-Lapierre Tue, 06 Feb 2018 22:47:05 -0500 + livecd-rootfs (2.498) bionic; urgency=medium * Don't write config/seeded-snaps if no snaps have been seeded. diff --git a/live-build/auto/config b/live-build/auto/config index 1e990087..a8f4d54a 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -655,10 +655,16 @@ esac # we'll expand the base seed given here according to the STRUCTURE file, and # then look in all of the seeds found to see which snaps are seeded -case $PROJECT in - ubuntu|kubuntu*|lubuntu*|xubuntu*|ubuntu-mate*|ubuntustudio*|ubuntukylin*|ubuntu-budgie*) +case $PROJECT:${SUBPROJECT:-} in + ubuntu:*|kubuntu*:*|lubuntu*:*|xubuntu*:*|ubuntu-mate*:*|ubuntustudio*:*|ubuntukylin*:*|ubuntu-budgie*:*) BASE_SEED='desktop' ;; + ubuntu-server:live) + BASE_SEED='server' + # subiquity is seeded but in a separate squashfs via hooks; set HOOK_SNAPS and ALL_SNAPS. + HOOK_SNAPS='subiquity' + ALL_SNAPS='' + ;; esac if [ -n "${BASE_SEED}" ]; then @@ -676,7 +682,7 @@ if [ -n "${BASE_SEED}" ]; then ALL_SNAPS="${ALL_SNAPS:+${ALL_SNAPS} }${snap}" done done - if [ -n "${ALL_SNAPS}" ]; then + if [ -n "${ALL_SNAPS}" ] || [ -n "${HOOK_SNAPS}" ]; then echo "${ALL_SNAPS}" > config/seeded-snaps fi fi From 621f6864aa07924f8554c42b1a32bd66b4ade245 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Tue, 6 Feb 2018 23:37:46 -0500 Subject: [PATCH 33/43] releasing package livecd-rootfs version 2.499 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7844ad87..3b676f01 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -livecd-rootfs (2.499) UNRELEASED; urgency=medium +livecd-rootfs (2.499) bionic; urgency=medium * live-build/auto/config: Take into account SUBPROJECT when setting seeded snaps, and also make sure we can work with snaps seeded in project hooks. - -- Mathieu Trudel-Lapierre Tue, 06 Feb 2018 22:47:05 -0500 + -- Mathieu Trudel-Lapierre Tue, 06 Feb 2018 23:37:32 -0500 livecd-rootfs (2.498) bionic; urgency=medium From a7f8044a85e79be38f6fa763a0f7635a0cc4da6b Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Thu, 8 Feb 2018 13:43:36 +1300 Subject: [PATCH 34/43] Disable the snapd.refresh.timer in the live server session. --- debian/changelog | 6 ++++++ .../overlay/etc/systemd/system/snapd.refresh.timer | 1 + 2 files changed, 7 insertions(+) create mode 120000 live-build/ubuntu-server/includes.binary/overlay/etc/systemd/system/snapd.refresh.timer diff --git a/debian/changelog b/debian/changelog index 3b676f01..ae157648 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.500) UNRELEASED; urgency=medium + + * Disable the snapd.refresh.timer in the live server session. + + -- Michael Hudson-Doyle Thu, 08 Feb 2018 13:43:12 +1300 + livecd-rootfs (2.499) bionic; urgency=medium * live-build/auto/config: Take into account SUBPROJECT when setting seeded diff --git a/live-build/ubuntu-server/includes.binary/overlay/etc/systemd/system/snapd.refresh.timer b/live-build/ubuntu-server/includes.binary/overlay/etc/systemd/system/snapd.refresh.timer new file mode 120000 index 00000000..dc1dc0cd --- /dev/null +++ b/live-build/ubuntu-server/includes.binary/overlay/etc/systemd/system/snapd.refresh.timer @@ -0,0 +1 @@ +/dev/null \ No newline at end of file From e2f5f3b56b3ead4f691697de92f252e61ef1b0c5 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Thu, 8 Feb 2018 20:13:50 +1300 Subject: [PATCH 35/43] releasing package livecd-rootfs version 2.500 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ae157648..449edae9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.500) UNRELEASED; urgency=medium +livecd-rootfs (2.500) bionic; urgency=medium * Disable the snapd.refresh.timer in the live server session. From 62a6e6270fb0a14424ade62a24dbd143f398c99a Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Fri, 9 Feb 2018 15:08:51 +1300 Subject: [PATCH 36/43] shuffle subiquity service definition to a mix of a snapd-generated service file (not in this branch) and an overlay (in this branch) --- .../multi-user.target.wants/subiquity.service | 1 - .../subiquity.conf | 13 +++++++++ .../systemd/system/subiquity-debug@.service | 24 ---------------- .../lib/systemd/system/subiquity.service | 28 ------------------- 4 files changed, 13 insertions(+), 53 deletions(-) delete mode 120000 live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/multi-user.target.wants/subiquity.service create mode 100644 live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/snap.subiquity.subquity-service.d/subiquity.conf delete mode 100644 live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity-debug@.service delete mode 100644 live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity.service diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/multi-user.target.wants/subiquity.service b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/multi-user.target.wants/subiquity.service deleted file mode 120000 index 4d9ea45c..00000000 --- a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/multi-user.target.wants/subiquity.service +++ /dev/null @@ -1 +0,0 @@ -../subiquity.service \ No newline at end of file diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/snap.subiquity.subquity-service.d/subiquity.conf b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/snap.subiquity.subquity-service.d/subiquity.conf new file mode 100644 index 00000000..76c1cb7f --- /dev/null +++ b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/snap.subiquity.subquity-service.d/subiquity.conf @@ -0,0 +1,13 @@ +[Unit] +IgnoreOnIsolate=yes +After=systemd-user-sessions.service plymouth-quit-wait.service + +[Service] +UtmpIdentifier=tty1 +TTYPath=/dev/tty1 +TTYReset=yes +TTYVHangup=yes +TTYVTDisallocate=yes +KillMode=process +IgnoreSIGPIPE=no +SendSIGHUP=yes diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity-debug@.service b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity-debug@.service deleted file mode 100644 index 3a7edb15..00000000 --- a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity-debug@.service +++ /dev/null @@ -1,24 +0,0 @@ -[Unit] -Description=Subiquity debug shell %I -After=systemd-user-sessions.service plymouth-quit-wait.service -After=rc-local.service -IgnoreOnIsolate=yes -ConditionPathExists=/dev/tty0 -ConditionPathExists=!/run/subiquity/complete - -[Service] -Environment=PYTHONPATH=/usr/share/subiquity -ExecStartPre=/bin/systemctl stop getty@%I -ExecStart=/sbin/agetty -n --noclear -l /usr/share/subiquity/subiquity-debug %I $TERM -ExecStopPost=/bin/systemctl start getty@%I -Type=idle -Restart=always -RestartSec=0 -UtmpIdentifier=%I -TTYPath=/dev/%I -TTYReset=yes -TTYVHangup=yes -TTYVTDisallocate=yes -KillMode=process -IgnoreSIGPIPE=no -SendSIGHUP=yes diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity.service b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity.service deleted file mode 100644 index 5357f04f..00000000 --- a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity.service +++ /dev/null @@ -1,28 +0,0 @@ -[Unit] -Description=Subiquity, the installer for Ubuntu Server -After=systemd-user-sessions.service plymouth-quit-wait.service -After=rc-local.service -Requires=snapd.service -IgnoreOnIsolate=yes -ConditionPathExists=/dev/tty0 -ConditionPathExists=!/run/subiquity/complete - -[Service] -Environment=PYTHONPATH=/usr/share/subiquity -Environment=SNAP_REEXEC=0 -ExecStartPre=/bin/systemctl stop getty@tty1 -ExecStartPre=/bin/dmesg -n 1 -ExecStartPre=/snap/bin/subiquity.subiquity-loadkeys -ExecStart=/sbin/agetty -n --noclear -l /snap/bin/subiquity tty1 $TERM -ExecStopPost=/bin/systemctl start getty@tty1 -Type=idle -Restart=always -RestartSec=0 -UtmpIdentifier=tty1 -TTYPath=/dev/tty1 -TTYReset=yes -TTYVHangup=yes -TTYVTDisallocate=yes -KillMode=process -IgnoreSIGPIPE=no -SendSIGHUP=yes From 4533ccfc5aef8068583d5decc22a79b2d1b646e2 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Mon, 12 Feb 2018 11:24:52 +0000 Subject: [PATCH 37/43] releasing package livecd-rootfs version 2.501 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 449edae9..90970f57 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.501) bionic; urgency=medium + + * Stop building ova, vmdk, vagrant images on i386. + + -- Dimitri John Ledkov Mon, 12 Feb 2018 11:24:49 +0000 + livecd-rootfs (2.500) bionic; urgency=medium * Disable the snapd.refresh.timer in the live server session. From b01a9b0d7aa6d681cd0c5703f02997a93e60b72e Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Tue, 13 Feb 2018 14:53:10 +1300 Subject: [PATCH 38/43] leave getty@tty1 in a state where it can be re-enabled --- .../lib/systemd/system/getty@tty1.service.d/conditional.conf | 2 ++ .../system/snap.subiquity.subquity-service.d/subiquity.conf | 1 + 2 files changed, 3 insertions(+) create mode 100644 live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/getty@tty1.service.d/conditional.conf diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/getty@tty1.service.d/conditional.conf b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/getty@tty1.service.d/conditional.conf new file mode 100644 index 00000000..da3eed67 --- /dev/null +++ b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/getty@tty1.service.d/conditional.conf @@ -0,0 +1,2 @@ +[Unit] +ConditionPathExists=/run/subiquity/complete \ No newline at end of file diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/snap.subiquity.subquity-service.d/subiquity.conf b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/snap.subiquity.subquity-service.d/subiquity.conf index 76c1cb7f..9ae26356 100644 --- a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/snap.subiquity.subquity-service.d/subiquity.conf +++ b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/snap.subiquity.subquity-service.d/subiquity.conf @@ -1,6 +1,7 @@ [Unit] IgnoreOnIsolate=yes After=systemd-user-sessions.service plymouth-quit-wait.service +ConditionPathExists=!/run/subiquity/complete [Service] UtmpIdentifier=tty1 From 110c558d2a0bd55de86a62340125386afae9eb04 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Wed, 14 Feb 2018 12:46:10 +1300 Subject: [PATCH 39/43] releasing package livecd-rootfs version 2.502 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5b4b3371..7ddcda39 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -livecd-rootfs (2.502) UNRELEASED; urgency=medium +livecd-rootfs (2.502) bionic; urgency=medium * Shuffle subiquity service definition to a mix of a snapd-generated service file (from the subiquity snap) and an overlay (in this package). - -- Michael Hudson-Doyle Wed, 14 Feb 2018 12:43:16 +1300 + -- Michael Hudson-Doyle Wed, 14 Feb 2018 12:46:06 +1300 livecd-rootfs (2.501) bionic; urgency=medium From 15d9269e57326771b108ad4a804629de2fd62b17 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Thu, 15 Feb 2018 09:31:07 +1300 Subject: [PATCH 40/43] Install linux-signed-generic in the live-server image. (LP: #1749065) --- debian/changelog | 6 ++++++ live-build/auto/config | 3 +++ 2 files changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index 7ddcda39..28ee56bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.503) UNRELEASED; urgency=medium + + * Install linux-signed-generic in the live-server image. (LP: #1749065) + + -- Michael Hudson-Doyle Thu, 15 Feb 2018 09:30:06 +1300 + livecd-rootfs (2.502) bionic; urgency=medium * Shuffle subiquity service definition to a mix of a snapd-generated service diff --git a/live-build/auto/config b/live-build/auto/config index a8f4d54a..8ce877b5 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -496,6 +496,9 @@ case $PROJECT in add_task install standard add_task install server LIVE_TASK='cloud-image' + case $ARCH in + amd64) add_package live linux-signed-generic ;; + esac ;; esac COMPONENTS='main' From f054c56bec119262f0ad35e2cdcd9b931ddbc576 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Thu, 15 Feb 2018 09:54:21 +1300 Subject: [PATCH 41/43] releasing package livecd-rootfs version 2.503 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 28ee56bf..e7f7ebe7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -livecd-rootfs (2.503) UNRELEASED; urgency=medium +livecd-rootfs (2.503) bionic; urgency=medium * Install linux-signed-generic in the live-server image. (LP: #1749065) - -- Michael Hudson-Doyle Thu, 15 Feb 2018 09:30:06 +1300 + -- Michael Hudson-Doyle Thu, 15 Feb 2018 09:54:14 +1300 livecd-rootfs (2.502) bionic; urgency=medium From d1b26ce330cc838d4f58f332791ed8737b45caae Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Tue, 20 Feb 2018 15:22:43 +1300 Subject: [PATCH 42/43] Override JobRunningTimeoutSec to 0s on the .device unit that subiquity_config.mount depends on to avoid a 5s delay on switching to a new VT when there is no device there (LP: #1750117) --- debian/changelog | 8 ++++++++ .../hooks/032-installer-squashfs.binary | 12 ++++++++++++ 2 files changed, 20 insertions(+) diff --git a/debian/changelog b/debian/changelog index e7f7ebe7..1c769d40 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.504) UNRELEASED; urgency=medium + + * Override JobRunningTimeoutSec to 0s on the .device unit that + subiquity_config.mount depends on to avoid a 5s delay on switching to a + new VT when there is no device there (LP: #1750117) + + -- Michael Hudson-Doyle Tue, 20 Feb 2018 12:57:07 +1300 + livecd-rootfs (2.503) bionic; urgency=medium * Install linux-signed-generic in the live-server image. (LP: #1749065) diff --git a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary index 87c743dd..fe970005 100755 --- a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary +++ b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary @@ -33,6 +33,18 @@ mount_overlay "$SQUASH_ROOT/" "$OVERLAY_ROOT/" "$SQUASH_ROOT/" setup_mountpoint binary/boot/squashfs.dir +# Override JobRunningTimeoutSec to 0s on the .device unit that +# subiquity_config.mount depends on to avoid a 5s delay on switching +# to a new VT when there is no device there (LP: #1750117). +# It would be better to have this in ../includes.binary/overlay but +# you can't have backslashes in filenames in bzr branches! +DEVICE_UNIT_NAME='dev-disk-by\x2duuid-00c629d6\x2d06ab\x2d4dfd\x2db21e\x2dc3186f34105d.device' +mkdir -p "$SQUASH_ROOT/etc/systemd/system/$DEVICE_UNIT_NAME.d" +cat > "$SQUASH_ROOT/etc/systemd/system/$DEVICE_UNIT_NAME.d/override.conf" < Date: Wed, 21 Feb 2018 10:40:04 +1300 Subject: [PATCH 43/43] releasing package livecd-rootfs version 2.504 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1c769d40..4a0609e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -livecd-rootfs (2.504) UNRELEASED; urgency=medium +livecd-rootfs (2.504) bionic; urgency=medium * Override JobRunningTimeoutSec to 0s on the .device unit that subiquity_config.mount depends on to avoid a 5s delay on switching to a new VT when there is no device there (LP: #1750117) - -- Michael Hudson-Doyle Tue, 20 Feb 2018 12:57:07 +1300 + -- Michael Hudson-Doyle Wed, 21 Feb 2018 10:39:58 +1300 livecd-rootfs (2.503) bionic; urgency=medium