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

remove stuff for copying autoinstall files around

Browse Source
This commit is contained in:
Michael Hudson-Doyle 2020-03-03 14:11:22 +01:00
parent f6e5da24f9
commit 0dc12a1122
2 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,14 +50,6 @@ JobRunningTimeoutSec=0s
Wants=subiquity_config.mount Wants=subiquity_config.mount
EOF EOF
AUTOINSTALL_DEVICE_UNIT='dev-disk-by\x2dlabel-autoinstall.device'
mkdir -p "$INSTALLER_ROOT/etc/systemd/system/$AUTOINSTALL_DEVICE_UNIT.d"
cat > "$INSTALLER_ROOT/etc/systemd/system/$AUTOINSTALL_DEVICE_UNIT.d/override.conf" <<EOF
[Unit]
JobRunningTimeoutSec=0s
Wants=subiquity_autoinstall.mount
EOF
# Prepare installer layer. # Prepare installer layer.
# Install: # Install:
@ -88,18 +80,6 @@ snap_preseed $INSTALLER_ROOT subiquity/classic
# Drop lxd from the installer layer preseed # Drop lxd from the installer layer preseed
sed -i -e'N;/name: lxd/,+2d' $INSTALLER_ROOT/var/lib/snapd/seed/seed.yaml sed -i -e'N;/name: lxd/,+2d' $INSTALLER_ROOT/var/lib/snapd/seed/seed.yaml
# Add initramfs hook to copy /autoinstall.yaml from initrd
# /run/initrd-autoinstall.yaml
cat <<EOF > "$INSTALLER_ROOT"/etc/initramfs-tools/scripts/init-bottom/copy-autoinstall
#!/bin/sh
case \$1 in
prereqs) exit 0;;
esac
[ -f /autoinstall.yaml ] && cp /autoinstall.yaml /run/initrd-autoinstall.yaml
EOF
chmod +x "$INSTALLER_ROOT"/etc/initramfs-tools/scripts/init-bottom/copy-autoinstall
teardown_mountpoint "$INSTALLER_ROOT" teardown_mountpoint "$INSTALLER_ROOT"
squashfs_f="${PWD}/livecd.${PROJECT}.installer.squashfs" squashfs_f="${PWD}/livecd.${PROJECT}.installer.squashfs"

4
live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/subiquity_autoinstall.mount
View File

@ -1,4 +0,0 @@
[Mount]
What=/dev/disk/by-label/autoinstall
Where=/autoinstall
Type=ext4