|
|
@ -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"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
squashfs_f="${PWD}/livecd.${PROJECT}.installer.squashfs"
|
|
|
|
squashfs_f="${PWD}/livecd.${PROJECT}.installer.squashfs"
|
|
|
|
|
|
|
|
|
|
|
|
(cd "$OVERLAY_ROOT/" &&
|
|
|
|
(cd "$OVERLAY_ROOT/" &&
|
|
|
|