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

Also adjust live-build/ubuntu-server/hooks/032-installer-squashfs.binary

Browse Source 
to use teardown_mountpoint.
This commit is contained in:
Steve Langasek 2017-09-13 12:13:08 -07:00
parent 9165a7dd8a
commit e513917862
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/changelog vendored
View File

@ -8,6 +8,10 @@ livecd-rootfs (2.441.6) UNRELEASED; urgency=medium
* live-build/ubuntu-cpc/functions: Remove umount_settle function. * live-build/ubuntu-cpc/functions: Remove umount_settle function.
The was only used where teardown_mountpoint was lacking. The was only used where teardown_mountpoint was lacking.
[ Steve Langasek ]
* Also adjust live-build/ubuntu-server/hooks/032-installer-squashfs.binary
to use teardown_mountpoint.
-- Robert C Jennings <robert.jennings@canonical.com> Wed, 13 Sep 2017 13:36:40 -0500 -- Robert C Jennings <robert.jennings@canonical.com> Wed, 13 Sep 2017 13:36:40 -0500
livecd-rootfs (2.441.5) zesty; urgency=medium livecd-rootfs (2.441.5) zesty; urgency=medium

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

@ -28,11 +28,11 @@ OVERLAY_ROOT=binary/boot/overlay.dir
mkdir -p "$OVERLAY_ROOT" mkdir -p "$OVERLAY_ROOT"
setup_mountpoint binary/boot/squashfs.dir
# Create an installer squashfs layer # Create an installer squashfs layer
mount_overlay "$SQUASH_ROOT/" "$OVERLAY_ROOT/" "$SQUASH_ROOT/" mount_overlay "$SQUASH_ROOT/" "$OVERLAY_ROOT/" "$SQUASH_ROOT/"
setup_mountpoint binary/boot/squashfs.dir
# Prepare installer layer. # Prepare installer layer.
# Install any requirements for the installer, for things we don't want # Install any requirements for the installer, for things we don't want
@ -147,17 +147,11 @@ AAHP0AEiHQ7zN0yLl7+fkYIMy64xQJqamH1Z2BFN0GWMPwTjpXpszOC+ev7Bpbg0xoldQ1tBHHxH
J4Weia71DnXOnt8cj1VhebVMlyv7B/TGAbGwgprgmQ== J4Weia71DnXOnt8cj1VhebVMlyv7B/TGAbGwgprgmQ==
EOF EOF
mv resolv.conf.tmp "binary/boot/squashfs.dir/etc/resolv.conf" teardown_mountpoint "$SQUASH_ROOT"
# Unmount the overlay first, where it is mounted: # Then unmount the overlay
umount "$SQUASH_ROOT" umount "$SQUASH_ROOT"
# Then we can start unmounting the "real" root:
umount "binary/boot/squashfs.dir/proc"
umount "binary/boot/squashfs.dir/sys"
umount -R "binary/boot/squashfs.dir/dev"
umount "binary/boot/squashfs.dir/tmp"
apt-get -qqy install squashfs-tools apt-get -qqy install squashfs-tools
squashfs_f="${PWD}/livecd.${PROJECT}.installer.squashfs" squashfs_f="${PWD}/livecd.${PROJECT}.installer.squashfs"