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

Imported 2.551

Browse Source 
No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2018-12-17 11:26:07 +00:00
parent dfc2e072be
commit e5d5bd4799
4 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
debian/changelog vendored
View File

@ -1,3 +1,19 @@
livecd-rootfs (2.551) disco; urgency=medium
* Do no install openssh-server in the base filsystem for the live server
installer.
* Use right lsb_release argument for HWE kernel name (-sc -> bionic, need
-sr -> 18.04).
* A few simple tweaks to reduce size of live servers installer.squashfs:
- Do not run apt-get update (which can bring in package lists if we are
unlucky wrt publisher schedules).
- Run apt-get clean to clear out downloaded debs of curtin/casper and
dependencies.
- Do not install user-setup.
- Use the core snap from the base filesystem if present.
-- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Mon, 17 Dec 2018 13:40:21 +1300
livecd-rootfs (2.550) disco; urgency=medium livecd-rootfs (2.550) disco; urgency=medium
[ Balint Reczey ] [ Balint Reczey ]

2
live-build/auto/config
View File

@ -513,7 +513,7 @@ case $PROJECT in
live) live)
add_task install standard add_task install standard
add_task install server add_task install server
LIVE_TASK='cloud-image' add_package install cloud-init
;; ;;
esac esac
COMPONENTS='main' COMPONENTS='main'

17
live-build/ubuntu-server/hooks/032-installer-squashfs.binary
View File

@ -51,8 +51,9 @@ EOF
# Install any requirements for the installer, for things we don't want # Install any requirements for the installer, for things we don't want
# to see on the installed system # to see on the installed system
chroot $INSTALLER_ROOT apt-get update chroot $INSTALLER_ROOT apt-get -y install curtin lupin-casper
chroot $INSTALLER_ROOT apt-get -y install user-setup curtin lupin-casper chroot $INSTALLER_ROOT apt-get clean
# For bug #1743643 "Install to dirty disk with swap fails" remove the # For bug #1743643 "Install to dirty disk with swap fails" remove the
# "helpful" casper script that mounts any swap partitions it finds. # "helpful" casper script that mounts any swap partitions it finds.
@ -65,15 +66,17 @@ touch $INSTALLER_ROOT/etc/cloud/cloud-init.disabled
chroot $INSTALLER_ROOT mkdir -p /var/lib/snapd/seed/snaps /var/lib/snapd/seed/assertions chroot $INSTALLER_ROOT mkdir -p /var/lib/snapd/seed/snaps /var/lib/snapd/seed/assertions
chroot $INSTALLER_ROOT sh -c ' chroot $INSTALLER_ROOT sh -c '
set -x; set -x;
cd /var/lib/snapd/seed; mkdir -p /var/lib/snapd/seed/snaps/
sudo SNAPPY_STORE_NO_CDN=1 snap download core; cd /var/lib/snapd/seed/snaps/;
sudo SNAPPY_STORE_NO_CDN=1 snap download subiquity; if [ ! -e core_*.snap ]; then
SNAPPY_STORE_NO_CDN=1 snap download core
fi
SNAPPY_STORE_NO_CDN=1 snap download subiquity;
CORE_SNAP=$(ls -1 core*.snap); CORE_SNAP=$(ls -1 core_*.snap);
SUBIQUITY_SNAP=$(ls -1 subiquity*.snap); SUBIQUITY_SNAP=$(ls -1 subiquity*.snap);
mv *.assert /var/lib/snapd/seed/assertions/; mv *.assert /var/lib/snapd/seed/assertions/;
mv *.snap /var/lib/snapd/seed/snaps/;
cat <<EOF > /var/lib/snapd/seed/seed.yaml cat <<EOF > /var/lib/snapd/seed/seed.yaml
snaps: snaps:

2
live-build/ubuntu-server/hooks/033-kernel-bits.binary
View File

@ -35,7 +35,7 @@ for variant in $variants; do
kernel_metapkg=linux-generic kernel_metapkg=linux-generic
flavor=generic flavor=generic
elif [ "$variant" = "hwe" ]; then elif [ "$variant" = "hwe" ]; then
kernel_metapkg=linux-generic-hwe-$(lsb_release -sc) kernel_metapkg=linux-generic-hwe-$(lsb_release -sr)
flavor=generic-hwe flavor=generic-hwe
else else
echo "bogus variant: $variant" echo "bogus variant: $variant"