From: Ian Kelling Date: Fri, 18 Oct 2019 20:29:48 +0000 (-0400) Subject: various fixes mostly for linode X-Git-Url: https://iankelling.org/git/?a=commitdiff_plain;h=948ef49d2b4d7680da2355acf9da86f81ca75ecd;p=automated-distro-installer various fixes mostly for linode --- diff --git a/README b/README index f20bd12..312d330 100644 --- a/README +++ b/README @@ -64,29 +64,44 @@ Some of the scripts have dependencies for some simple obvious utility scripts from https://iankelling.org/git, and of course there are some hostnames that are specific to my network. + +# Per-host/install configuration + Before doing a fai install, you will need to populate a class file. I -use one called 5-multi-boot, which you can see example of in +use one called 51-multi-boot, which you can see example of in fai/config/class/50-host-classes. + + Before doing a fai install, you will need to populate /q/root/luks and /q/root/shadow, see their references. You might also want to copy existing /etc/ssh/*host* to /p/c/machine_specific/HOST/filesystem/etc/ssh. +host-* luks keyfiles generated like: +head -c 2048 /dev/urandom | od | s dd of=/q/root/luks/host-demohost +Configuration of which luks key to use is in +fai/config/hooks/partition.DEFAULT -All scripts meant to be used directly are listed here: +Configuration of which (if any) shadow file to use is in +fai/config/distro-install-common/end +and which shadow file / luks file(s) to copy into the new machine depends +on fai-redep arguments. +# Scripts (meant to be used directly): -# Scripts to setup the environment for the install +# Setup the environment for the install # create tiny autodiscover cd fai-redep && sudo fai-cd -g $PWD/grub.cfg.autodiscover -f -A $BASEFILE_DIR/autodiscover.iso # create normal fai cd (replace TARGET_HOST) fai-redep -t TARGET_HOST && sudo fai-cd -M -g $PWD/grub.cfg.netinst -f $BASEFILE_DIR/netinst.iso -note, may need to set hostname in something like LAST.var -also, may need to unset proxy. +note, may need to set hostname, depending on config, +and some other things for environment not on your lan +for example see fai/config/class/LINODE.var. See linode notes below. + mymk-basefile # Create basefiles for various distros archlike-pxe # Setup pxe boot server from an archlike base image fai-redep # Deploy fai configuration to host "faiserver" @@ -171,6 +186,23 @@ addgroup: The group `systemd-journal' already exists as a system group. Exiting. Operation failed: No such file or directory +# linode notes + +* create 2 disks, installer (3000 mb, raw), boot (remaining, raw) +* create 2 profiles w direct boot, no helpers: + * installer (sda=boot, sdb=installer, boot dev=sdb) + * boot (sda=boot) +* Boot into rescue mode, ssh in with lish, + curl url_to_some_fai_cd_created_image | dd of=/dev/sda + poweroff +* boot into installer. +* Lish shows console, at the end of install, it gives prompt because + logs failed to save remotely, check the logs, then reboot into boot + profile if all is well. If that doesn't happen, turn off lassie in + settings. + + + # TODO Change arch to archlike and to support arch and parabola diff --git a/fai-redep b/fai-redep index c90aea8..ac73c7b 100755 --- a/fai-redep +++ b/fai-redep @@ -59,10 +59,13 @@ sudo rsync -a /root/.ssh/home.pub \ # these files are not available. if [[ $target ]]; then + if [[ -e /q/root/shadow/$target ]]; then + shadowfile=shadow/$target # empty otherwise + fi sudo rsync -lpt --files-from=- /q/root root@$faiserver_host:/srv/fai/config/distro-install-common <= 4 disks with boot partititions. # -# +# LINODE: For running a vm on linode, especially one created with fai-cd. ###### begin Template for 51-multi-boot ###### # diff --git a/fai/config/class/BUSTER_LINODE.var b/fai/config/class/BUSTER_LINODE.var deleted file mode 100644 index 9030f9e..0000000 --- a/fai/config/class/BUSTER_LINODE.var +++ /dev/null @@ -1,2 +0,0 @@ -HOSTNAME=li -APTPROXY= \ No newline at end of file diff --git a/fai/config/class/LINODE.var b/fai/config/class/LINODE.var new file mode 100644 index 0000000..e8bfb1f --- /dev/null +++ b/fai/config/class/LINODE.var @@ -0,0 +1,7 @@ +APTPROXY= +linode_ip=1.2.3.4 +linode_gw=1.2.3.1 +# this is the same at least in 2 regions +linode_if=enp0s3 +LOGSERVER=b8.nz +HOSTNAME=l2 diff --git a/fai/config/distro-install-common/end b/fai/config/distro-install-common/end index 2871106..3d061b3 100755 --- a/fai/config/distro-install-common/end +++ b/fai/config/distro-install-common/end @@ -22,6 +22,7 @@ USER2PW=/q/root/shadow/user2 if ifclass ziva; then ROOTPW=/q/root/shadow/ziva else + # if doesn't exist, we dont set one ROOTPW=/q/root/shadow/standard fi diff --git a/fai/config/files/etc/apt/sources.list.d/buster.list/BUSTER_LINODE b/fai/config/files/etc/apt/sources.list.d/buster.list/BUSTER_LINODE deleted file mode 100644 index 38f7cbf..0000000 --- a/fai/config/files/etc/apt/sources.list.d/buster.list/BUSTER_LINODE +++ /dev/null @@ -1,14 +0,0 @@ -deb http://mirrors.linode.com/debian/ buster main -deb-src http://mirrors.linode.com/debian/ buster main - -deb http://security.debian.org/ buster/updates main -deb-src http://security.debian.org/ buster/updates main - -deb http://mirrors.linode.com/debian/ buster-updates main -deb-src http://mirrors.linode.com/debian/ buster-updates main - -deb http://mirrors.linode.com/debian/ buster-backports main -deb-src http://mirrors.linode.com/debian/ buster-backports main - -deb http://http.us.debian.org/debian unstable main contrib non-free -deb-src http://http.us.debian.org/debian unstable main contrib non-free diff --git a/fai/config/files/etc/apt/sources.list.d/stretch.list/STRETCH_LINODE b/fai/config/files/etc/apt/sources.list.d/stretch.list/STRETCH_LINODE deleted file mode 100644 index adf01da..0000000 --- a/fai/config/files/etc/apt/sources.list.d/stretch.list/STRETCH_LINODE +++ /dev/null @@ -1,11 +0,0 @@ -deb http://mirrors.linode.com/debian/ stretch main -deb-src http://mirrors.linode.com/debian/ stretch main - -deb http://security.debian.org/ stretch/updates main -deb-src http://security.debian.org/ stretch/updates main - -deb http://mirrors.linode.com/debian/ stretch-updates main -deb-src http://mirrors.linode.com/debian/ stretch-updates main - -deb http://mirrors.linode.com/debian/ stretch-backports main -deb-src http://mirrors.linode.com/debian/ stretch-backports main diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT index 2905435..ab436bd 100755 --- a/fai/config/hooks/partition.DEFAULT +++ b/fai/config/hooks/partition.DEFAULT @@ -297,8 +297,7 @@ bpart() { # btrfs a partition } -# keyfiles generated like: -# head -c 2048 /dev/urandom | od | s dd of=/q/root/luks/host-demohost +# see README for docs about how to create these luks_dir=${LUKS_DIR:-/var/lib/fai/config/distro-install-common/luks} @@ -318,12 +317,12 @@ fi # # note, corresponding changes in /b/ds/keyscript-{on,off} if ifclass tpnew; then lukspw=$(cat $luks_dir/traci) -elif ifclass BUSTER_LINODE; then - lukspw=$(cat $luks_dir/li) elif ifclass ziva; then lukspw=$(cat $luks_dir/ziva) elif ifclass demohost; then lukspw=x +elif [[ -e $luks_dir/$HOSTNAME ]]; then + lukspw=$(cat $luks_dir/$HOSTNAME) else lukspw=$(cat $luks_dir/iank) fi diff --git a/fai/config/scripts/DEBIAN/30-interface b/fai/config/scripts/DEBIAN/30-interface index 808aa25..74c3058 100755 --- a/fai/config/scripts/DEBIAN/30-interface +++ b/fai/config/scripts/DEBIAN/30-interface @@ -93,7 +93,7 @@ case "$FAI_ACTION" in elif [ -d $target/etc/network/interfaces.d ]; then # ifupdown >= 0.7.41 (Debian >= 8, Ubuntu >= 14.04) - if ifclass VM || ifclass BUSTER_LINODE; then + if ifclass VM || ifclass LINODE; then # note, this condition would apply to the elif below too, # but I don't specify a static ip in fai, so not bothering cat > $target/etc/network/interfaces <<-EOF @@ -103,6 +103,8 @@ iface lo inet loopback iface $NIC1 inet dhcp iface $NIC1 inet6 auto EOF + + else cat > $target/etc/network/interfaces </etc/initramfs-tools/conf.d/mine < 60*60*2 )); then + $ROOTCMD apt-get update +fi chroot $FAI_ROOT bash <<'EOF' @@ -101,7 +104,7 @@ EOF if [[ $FAI_ACTION != dirinstall ]]; then - if ifclass BUSTER_LINODE; then + if ifclass LINODE; then speed=19200 # luks.crypttab=no see man systemd-cryptsetup-generator cmdline="luks.crypttab=no console=ttyS0,${speed}n8" @@ -126,26 +129,33 @@ terminal_output --append serial EOF - chroot $FAI_ROOT bash </etc/initramfs-tools/modules update-initramfs -u -k all EOF + fi fi