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

respond to some review feedback

Browse Source
This commit is contained in:
Michael Hudson-Doyle 2018-02-23 09:18:33 +13:00
parent a7e7ee9154
commit c85cae9bfe
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
livecd-rootfs (2.505) UNRELEASED; urgency=medium
livecd-rootfs (2.505~ppa1) bionic; urgency=medium
* Move casper from filesystem.squashfs to installer.squashfs.

8
live-build/auto/config
View File

@ -141,11 +141,9 @@ case $IMAGEFORMAT in
INITRAMFS_TYPE=none
case $PROJECT:${SUBPROJECT:-} in
ubuntu-server:live)
# Hack to stop lb installing casper into filesystem.squashfs
# (It's manually installed into installer.sqashfs in
# 032-installer-squashfs.binary)
mkdir -p .build
touch .build/chroot_live-packages
# Stop lp installing casper into filesystem.squashfs
# by skipping lb_chroot_live-packages.
skip_lb_stage chroot_live-packages
INITRAMFS_TYPE=auto
;;
*)

6
live-build/functions
View File

@ -329,3 +329,9 @@ undivert_grub() {
chroot "$CHROOT_ROOT" dpkg-divert --remove --local \
--rename /usr/bin/systemd-detect-virt
}
skip_lb_stage() {
STAGE="$1"
mkdir -p .build
touch ".build/$STAGE"
}

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

@ -50,8 +50,7 @@ EOF
# Install any requirements for the installer, for things we don't want
# 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 lupin-casper
chroot $SQUASH_ROOT apt-get -y install user-setup lupin-casper
# Installing lupin-casper means we need a new initramfs, so we
# cargo cult stuff from lb_chroot_hacks: