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

Refactor ubuntu-cpc hooks to hard-code producing an 'ext4' rootfs, which

Browse Source 
is used outside of the livecd-rootfs build process (specifically for EC2
publication).
This commit is contained in:
Daniel Watkins 2016-02-22 11:31:01 +00:00
parent 02b79f5ef2
commit 6f6fb2834b
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
livecd-rootfs (2.380) UNRELEASED; urgency=medium
* Refactor ubuntu-cpc hooks to hard-code producing an 'ext4' rootfs, which
is used outside of the livecd-rootfs build process (specifically for EC2
publication).
-- Daniel Watkins <daniel.watkins@canonical.com> Mon, 22 Feb 2016 11:29:26 +0000
livecd-rootfs (2.379) xenial; urgency=medium livecd-rootfs (2.379) xenial; urgency=medium
* add /var/lib/systemd/rfkill to pre-created dirs to use as writable * add /var/lib/systemd/rfkill to pre-created dirs to use as writable

8
live-build/auto/config
View File

@ -103,7 +103,7 @@ add_binary_hook ()
case $PROJECT in case $PROJECT in
ubuntu-cpc) ubuntu-cpc)
IMAGEFORMAT=plain IMAGEFORMAT=ext4
;; ;;
esac esac
@ -116,11 +116,17 @@ case $IMAGEFORMAT in
add_package install lupin-support add_package install lupin-support
COMPONENTS='main restricted universe multiverse' COMPONENTS='main restricted universe multiverse'
;; ;;
*)
case $PROJECT in
ubuntu-cpc)
;;
*) *)
add_package live jasper add_package live jasper
;; ;;
esac esac
;; ;;
esac
;;
plain) plain)
OPTS="${OPTS:+$OPTS }--initramfs none --chroot-filesystem $IMAGEFORMAT" OPTS="${OPTS:+$OPTS }--initramfs none --chroot-filesystem $IMAGEFORMAT"

3
live-build/ubuntu-cpc/hooks/030-root-tarball.binary
View File

@ -7,6 +7,9 @@ fi
. /build/config/functions . /build/config/functions
mkdir binary/boot/filesystem.dir
cp -a chroot/* binary/boot/filesystem.dir
setup_mountpoint binary/boot/filesystem.dir setup_mountpoint binary/boot/filesystem.dir
chroot binary/boot/filesystem.dir dpkg-divert --local --rename /usr/sbin/grub-probe chroot binary/boot/filesystem.dir dpkg-divert --local --rename /usr/sbin/grub-probe