From 86b64ef78e98fda8ae241b8a46da78256edfac2c Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Tue, 21 Mar 2017 18:22:58 -0400 Subject: [PATCH] Move curtin to installer squash. --- live-build/auto/config | 4 ---- .../ubuntu-server-next/hooks/032-installer-squashfs.binary | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/live-build/auto/config b/live-build/auto/config index e81d9217..67fcb896 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -375,10 +375,6 @@ case $PROJECT in add_task install standard add_task install server COMPONENTS='main restricted universe' - add_package install snapd - add_package install nplan - add_package install curtin - add_package install hdparm ;; ubuntu-core) diff --git a/live-build/ubuntu-server-next/hooks/032-installer-squashfs.binary b/live-build/ubuntu-server-next/hooks/032-installer-squashfs.binary index 61bb42d0..9dbc97a4 100755 --- a/live-build/ubuntu-server-next/hooks/032-installer-squashfs.binary +++ b/live-build/ubuntu-server-next/hooks/032-installer-squashfs.binary @@ -39,6 +39,7 @@ mount_overlay "$SQUASH_ROOT/" "$OVERLAY_ROOT/" "$SQUASH_ROOT/" # to see on the installed system chroot $SQUASH_ROOT apt-get update chroot $SQUASH_ROOT apt-get -y install user-setup +chroot $SQUASH_ROOT apt-get -y install curtin # Do the snap seeding dance. chroot $SQUASH_ROOT mkdir -p /var/lib/snapd/seed/snaps /var/lib/snapd/seed/assertions