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

Import patches-unapplied version 2.521 to ubuntu/bionic-proposed

Browse Source 
Imported using git-ubuntu import.

Changelog parent: 71b98bc5dfbd93634097a46c56672528481fbf2a

New changelog entries:
  * In subiquity image, mount additional squashfs in /media.
  * Make lzma initramfs compression opt-in rather than opt-out, and do not
    opt-in to it for live-server builds to speed up the boot. (LP: #1750873)
This commit is contained in:
Dimitri John Ledkov 2018-04-11 14:20:27 +02:00 committed by usd-importer
parent 71b98bc5df
commit abfea5773a
12 changed files with 59 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
debian/changelog vendored
View File

@ -1,3 +1,16 @@
livecd-rootfs (2.521) bionic; urgency=medium
* In subiquity image, mount additional squashfs in /media.
-- Dimitri John Ledkov <xnox@ubuntu.com> Wed, 11 Apr 2018 14:20:27 +0200
livecd-rootfs (2.520) bionic; urgency=medium
* Make lzma initramfs compression opt-in rather than opt-out, and do not
opt-in to it for live-server builds to speed up the boot. (LP: #1750873)
-- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Wed, 11 Apr 2018 19:15:49 +1200
livecd-rootfs (2.519) bionic; urgency=medium livecd-rootfs (2.519) bionic; urgency=medium
[ Robert C Jennings ] [ Robert C Jennings ]

10
live-build/auto/config
View File

@ -322,6 +322,12 @@ if ! [ -e config/germinate-output/structure ]; then
${COMPONENTS:+-c "$COMPONENTS"} -a $ARCH) ${COMPONENTS:+-c "$COMPONENTS"} -a $ARCH)
fi fi
case $PROJECT in
base|edubuntu|edubuntu-dvd|kubuntu|kubuntu-active|kubuntu-dvd|kubuntu-plasma5|lubuntu|lubuntu-next|mythbuntu|ubuntu|ubuntu-budgie|ubuntu-desktop-next|ubuntu-dvd|ubuntu-gnome|ubuntu-mate|ubuntu-netbook|ubuntukylin|ubuntustudio-dvd|xubuntu)
INITRAMFS_COMPRESSION="lzma"
;;
esac
case $PROJECT in case $PROJECT in
ubuntu|ubuntu-dvd) ubuntu|ubuntu-dvd)
add_task install minimal standard ubuntu-desktop add_task install minimal standard ubuntu-desktop
@ -559,7 +565,6 @@ case $PROJECT in
;; ;;
esac esac
OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none" OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
INITRAMFS_COMPRESSION="none"
# contains the framework definition # contains the framework definition
add_package install ubuntu-core-libs add_package install ubuntu-core-libs
@ -655,7 +660,6 @@ case $PROJECT in
OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs" OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs"
OPTS="${OPTS:+$OPTS }--ext-resize-blocks=536870912 --ext-block-size=4096" OPTS="${OPTS:+$OPTS }--ext-resize-blocks=536870912 --ext-block-size=4096"
OPTS="${OPTS:+$OPTS }--ext-fudge-factor=15" OPTS="${OPTS:+$OPTS }--ext-fudge-factor=15"
INITRAMFS_COMPRESSION="gzip"
;; ;;
*) *)
@ -823,7 +827,7 @@ lb config noauto \
${KERNEL_FLAVOURS:+--linux-flavours "$KERNEL_FLAVOURS"} \ ${KERNEL_FLAVOURS:+--linux-flavours "$KERNEL_FLAVOURS"} \
--initsystem none \ --initsystem none \
--bootloader "$BOOTLOADER" \ --bootloader "$BOOTLOADER" \
--initramfs-compression "${INITRAMFS_COMPRESSION:-lzma}" \ ${INITRAMFS_COMPRESSION:+--initramfs-compression "$INITRAMFS_COMPRESSION"} \
--cache false \ --cache false \
${BOOTAPPEND_LIVE:+--bootappend-live "$BOOTAPPEND_LIVE"} \ ${BOOTAPPEND_LIVE:+--bootappend-live "$BOOTAPPEND_LIVE"} \
$OPTS \ $OPTS \

1
live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/media-filesystem.mount Symbolic link
View File

@ -0,0 +1 @@
../media-filesystem.mount

1
live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/media-rack.lower.mount Symbolic link
View File

@ -0,0 +1 @@
../media-rack.lower.mount

1
live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/media-rack.mount Symbolic link
View File

@ -0,0 +1 @@
../media-rack.mount

1
live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/media-region.lower.mount Symbolic link
View File

@ -0,0 +1 @@
../media-region.lower.mount

1
live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/media-region.mount Symbolic link
View File

@ -0,0 +1 @@
../media-region.mount

5
live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-filesystem.mount Normal file
View File

@ -0,0 +1,5 @@
[Mount]
What=/cdrom/casper/filesystem.squashfs
Where=/media/filesystem
Type=squashfs
Options=ro

5
live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-rack.lower.mount Normal file
View File

@ -0,0 +1,5 @@
[Mount]
What=/cdrom/casper/maas/maas-rack.squashfs
Where=/media/rack.lower
Type=squashfs
Options=ro

9
live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-rack.mount Normal file
View File

@ -0,0 +1,9 @@
[Unit]
After=media-filesystem.mount
After=media-rack.lower.mount
[Mount]
What=overlay
Where=/media/rack
Type=overlay
Options=lowerdir=/media/rack.lower:/media/filesystem

5
live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-region.lower.mount Normal file
View File

@ -0,0 +1,5 @@
[Mount]
What=/cdrom/casper/maas/maas-region.squashfs
Where=/media/region.lower
Type=squashfs
Options=ro

10
live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-region.mount Normal file
View File

@ -0,0 +1,10 @@
[Unit]
After=media-filesystem.mount
After=media-rack.lower.mount
After=media-region.lower.mount
[Mount]
What=overlay
Where=/media/region
Type=overlay
Options=lowerdir=/media/region.lower:/media/rack.lower:/media/filesystem