Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-02-10 12:47:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Imported 2.685

Browse Source 
No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2020-08-13 02:00:29 +00:00
parent 6eb5365acd
commit a7aede350a
7 changed files with 36 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
debian/changelog vendored
View File

@ -1,3 +1,29 @@
livecd-rootfs (2.685) groovy; urgency=medium
* Revert 'ubuntu-cpc: Disable boot splash in all cloud images
(LP: #1725358)'
-- Robert C Jennings <robert.jennings@canonical.com> Wed, 12 Aug 2020 16:52:05 -0500
livecd-rootfs (2.684) groovy; urgency=medium
* ubuntu-cpc: Fix ppc64el grub console update
-- Robert C Jennings <robert.jennings@canonical.com> Wed, 12 Aug 2020 13:40:42 -0500
livecd-rootfs (2.683) groovy; urgency=medium
* Revert the removal of fstab from squashfs images, which has had knock-on
effects and breaks MAAS (ref bug #1890803)
-- Steve Langasek <steve.langasek@ubuntu.com> Wed, 12 Aug 2020 11:31:12 -0700
livecd-rootfs (2.682) groovy; urgency=medium
* ubuntu-cpc: Disable boot splash in all cloud images (LP: #1725358)
-- Robert C Jennings <robert.jennings@canonical.com> Wed, 12 Aug 2020 04:52:22 -0500
livecd-rootfs (2.681) groovy; urgency=medium
[ Patrick Wu ]

1
live-build/auto/config
View File

@ -35,7 +35,6 @@ mkdir -p config
cp -af /usr/share/livecd-rootfs/live-build/functions config/functions
cp -af /usr/share/livecd-rootfs/live-build/lb_*_layered config/
cp -af /usr/share/livecd-rootfs/live-build/snap-seed-parse.py config/snap-seed-parse
cp -af /usr/share/livecd-rootfs/live-build/squashfs-exclude-files config/
mkdir -p config/package-lists

11
live-build/functions
View File

@ -289,17 +289,6 @@ create_vmdk() {
rm -rf ${scratch_d}
}
create_squashfs() {
local config_dir rootfs_dir squashfs_file
rootfs_dir="$1"
squashfs_file="$2"
config_dir="$PWD/config"
(cd $rootfs_dir &&
mksquashfs . $squashfs_file -no-progress -xattrs -comp xz \
-ef "$config_dir/squashfs-exclude-files")
}
create_derivative() {
# arg1 is the disk type
# arg2 is the new name

1
live-build/squashfs-exclude-files
View File

@ -1 +0,0 @@
etc/fstab

9
live-build/ubuntu-cpc/hooks.d/base/root-squashfs.binary
View File

@ -8,15 +8,14 @@ if [ -n "$SUBARCH" ]; then
exit 0
fi
. config/functions
# This is the directory created by create-root-dir.binary
rootfs_dir=rootfs.dir
squashfs_f="$PWD/livecd.ubuntu-cpc.squashfs"
cp $rootfs_dir.manifest $squashfs_f.manifest
# fstab is omitted from the squashfs
grep -v '^/etc/fstab$' $rootfs_dir.filelist >$squashfs_f.filelist
cp $rootfs_dir.filelist $squashfs_f.filelist
create_squashfs $rootfs_dir $squashfs_f
(cd $rootfs_dir &&
mksquashfs . $squashfs_f \
-no-progress -xattrs -comp xz )

4
live-build/ubuntu-server/hooks/030-root-squashfs.binary
View File

@ -30,4 +30,6 @@ squashfs_f_manifest="${squashfs_f}.manifest"
create_manifest "binary/boot/squashfs.dir" "${squashfs_f_manifest}"
create_squashfs "binary/boot/squashfs.dir/" ${squashfs_f}
(cd "binary/boot/squashfs.dir/" &&
mksquashfs . ${squashfs_f} \
-no-progress -xattrs -comp xz )

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

@ -91,4 +91,6 @@ find $OVERLAY_ROOT/var/lib/snapd/ -name 'lxd_*.snap' -delete
squashfs_f="${PWD}/livecd.${PROJECT}.installer.squashfs"
create_squashfs "$OVERLAY_ROOT/" ${squashfs_f}
(cd "$OVERLAY_ROOT/" &&
mksquashfs . ${squashfs_f} \
-no-progress -xattrs -comp xz )