From ab949fac1802ff7ce193be7fa324791baa9c4fb9 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Fri, 7 Apr 2017 17:15:54 -0400 Subject: [PATCH] Rename ubuntu-server-live -> ubuntu-server --- live-build/auto/config | 35 +++++++++++-------- .../hooks/01-setup_modules.chroot | 0 .../hooks/030-root-squashfs.binary | 0 .../hooks/032-installer-squashfs.binary | 0 .../hooks/99-fix-resolvconf.chroot | 0 .../system/getty@.service.d/autologin.conf | 0 .../multi-user.target.wants/subiquity.service | 0 .../systemd/system/subiquity-debug@.service | 0 .../lib/systemd/system/subiquity.service | 0 .../includes.chroot/etc/hosts | 0 10 files changed, 20 insertions(+), 15 deletions(-) rename live-build/{ubuntu-server-live => ubuntu-server}/hooks/01-setup_modules.chroot (100%) rename live-build/{ubuntu-server-live => ubuntu-server}/hooks/030-root-squashfs.binary (100%) rename live-build/{ubuntu-server-live => ubuntu-server}/hooks/032-installer-squashfs.binary (100%) rename live-build/{ubuntu-server-live => ubuntu-server}/hooks/99-fix-resolvconf.chroot (100%) rename live-build/{ubuntu-server-live => ubuntu-server}/includes.binary/boot/overlay.dir/lib/systemd/system/getty@.service.d/autologin.conf (100%) rename live-build/{ubuntu-server-live => ubuntu-server}/includes.binary/boot/overlay.dir/lib/systemd/system/multi-user.target.wants/subiquity.service (100%) rename live-build/{ubuntu-server-live => ubuntu-server}/includes.binary/boot/overlay.dir/lib/systemd/system/subiquity-debug@.service (100%) rename live-build/{ubuntu-server-live => ubuntu-server}/includes.binary/boot/overlay.dir/lib/systemd/system/subiquity.service (100%) rename live-build/{ubuntu-server-live => ubuntu-server}/includes.chroot/etc/hosts (100%) diff --git a/live-build/auto/config b/live-build/auto/config index b5d7d471..1521dbe7 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -101,11 +101,11 @@ add_binary_hook () BINARY_HOOKS="${BINARY_HOOKS:+$BINARY_HOOKS }$1" } -case $PROJECT in - ubuntu-cpc) +case $PROJECT:$SUBPROJECT in + ubuntu-cpc:*) IMAGEFORMAT=ext4 ;; - ubuntu-server-live) + ubuntu-server:live) IMAGEFORMAT=plain ;; esac @@ -133,7 +133,13 @@ case $IMAGEFORMAT in plain) OPTS="${OPTS:+$OPTS }--initramfs none --chroot-filesystem $IMAGEFORMAT" - PREINSTALLED=true + case $PROJECT:$SUBPROJECT in + ubuntu-server:live) + ;; + *) + PREINSTALLED=true + ;; + esac ;; *) @@ -147,7 +153,7 @@ case $IMAGEFORMAT in ;; esac -if [ "$PREINSTALLED" = "true" ] && [ "$SUBPROJECT" != "wubi" ]; then +if [ "$PREINSTALLED" = "true" ]; then # This is an oem-config preinstalled image, touch a random file that # we can refer back to during build, cause that's wildly hackish touch config/oem-config-preinstalled @@ -171,7 +177,7 @@ if [ "$PREINSTALLED" = "true" ] && [ "$SUBPROJECT" != "wubi" ]; then ubuntu-server) add_package live oem-config-debconf ubiquity-frontend-debconf ;; - ubuntu-core|ubuntu-base|base|ubuntu-touch|ubuntu-touch-custom|ubuntu-cpc|ubuntu-desktop-next|ubuntu-server-live) + ubuntu-core|ubuntu-base|base|ubuntu-touch|ubuntu-touch-custom|ubuntu-cpc|ubuntu-desktop-next) ;; *) add_package live oem-config-gtk ubiquity-frontend-gtk @@ -366,18 +372,17 @@ case $PROJECT in ubuntu-server) add_task install minimal + case $SUBPROJECT in + live) + add_task install standard + add_task install server + LIVE_TASK='cloud-image' + ;; + esac COMPONENTS='main' PREINSTALL_POOL_SEEDS='server-ship' ;; - ubuntu-server-live) - add_task install minimal - add_task install standard - add_task install server - add_task install cloud-image - COMPONENTS='main' - ;; - ubuntu-core) OPTS="${OPTS:+$OPTS }--apt-recommends false" @@ -759,7 +764,7 @@ EOF fi ;; - ubuntu-touch:*|ubuntu-touch-custom:*|ubuntu-core:system-image|ubuntu-desktop-next:system-image|ubuntu-cpc:*|ubuntu-server-live:*) + ubuntu-touch:*|ubuntu-touch-custom:*|ubuntu-core:system-image|ubuntu-desktop-next:system-image|ubuntu-cpc:*|ubuntu-server:live) cp -af /usr/share/livecd-rootfs/live-build/${PROJECT}/* \ config/ ;; diff --git a/live-build/ubuntu-server-live/hooks/01-setup_modules.chroot b/live-build/ubuntu-server/hooks/01-setup_modules.chroot similarity index 100% rename from live-build/ubuntu-server-live/hooks/01-setup_modules.chroot rename to live-build/ubuntu-server/hooks/01-setup_modules.chroot diff --git a/live-build/ubuntu-server-live/hooks/030-root-squashfs.binary b/live-build/ubuntu-server/hooks/030-root-squashfs.binary similarity index 100% rename from live-build/ubuntu-server-live/hooks/030-root-squashfs.binary rename to live-build/ubuntu-server/hooks/030-root-squashfs.binary diff --git a/live-build/ubuntu-server-live/hooks/032-installer-squashfs.binary b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary similarity index 100% rename from live-build/ubuntu-server-live/hooks/032-installer-squashfs.binary rename to live-build/ubuntu-server/hooks/032-installer-squashfs.binary diff --git a/live-build/ubuntu-server-live/hooks/99-fix-resolvconf.chroot b/live-build/ubuntu-server/hooks/99-fix-resolvconf.chroot similarity index 100% rename from live-build/ubuntu-server-live/hooks/99-fix-resolvconf.chroot rename to live-build/ubuntu-server/hooks/99-fix-resolvconf.chroot diff --git a/live-build/ubuntu-server-live/includes.binary/boot/overlay.dir/lib/systemd/system/getty@.service.d/autologin.conf b/live-build/ubuntu-server/includes.binary/boot/overlay.dir/lib/systemd/system/getty@.service.d/autologin.conf similarity index 100% rename from live-build/ubuntu-server-live/includes.binary/boot/overlay.dir/lib/systemd/system/getty@.service.d/autologin.conf rename to live-build/ubuntu-server/includes.binary/boot/overlay.dir/lib/systemd/system/getty@.service.d/autologin.conf diff --git a/live-build/ubuntu-server-live/includes.binary/boot/overlay.dir/lib/systemd/system/multi-user.target.wants/subiquity.service b/live-build/ubuntu-server/includes.binary/boot/overlay.dir/lib/systemd/system/multi-user.target.wants/subiquity.service similarity index 100% rename from live-build/ubuntu-server-live/includes.binary/boot/overlay.dir/lib/systemd/system/multi-user.target.wants/subiquity.service rename to live-build/ubuntu-server/includes.binary/boot/overlay.dir/lib/systemd/system/multi-user.target.wants/subiquity.service diff --git a/live-build/ubuntu-server-live/includes.binary/boot/overlay.dir/lib/systemd/system/subiquity-debug@.service b/live-build/ubuntu-server/includes.binary/boot/overlay.dir/lib/systemd/system/subiquity-debug@.service similarity index 100% rename from live-build/ubuntu-server-live/includes.binary/boot/overlay.dir/lib/systemd/system/subiquity-debug@.service rename to live-build/ubuntu-server/includes.binary/boot/overlay.dir/lib/systemd/system/subiquity-debug@.service diff --git a/live-build/ubuntu-server-live/includes.binary/boot/overlay.dir/lib/systemd/system/subiquity.service b/live-build/ubuntu-server/includes.binary/boot/overlay.dir/lib/systemd/system/subiquity.service similarity index 100% rename from live-build/ubuntu-server-live/includes.binary/boot/overlay.dir/lib/systemd/system/subiquity.service rename to live-build/ubuntu-server/includes.binary/boot/overlay.dir/lib/systemd/system/subiquity.service diff --git a/live-build/ubuntu-server-live/includes.chroot/etc/hosts b/live-build/ubuntu-server/includes.chroot/etc/hosts similarity index 100% rename from live-build/ubuntu-server-live/includes.chroot/etc/hosts rename to live-build/ubuntu-server/includes.chroot/etc/hosts