X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fscripts%2FGRUB_PC%2F11-iank;h=d8fb48dc5120cf49dbfe8dd2c5ec3bb0916329c7;hb=cef9b6ede5c1e028bed1b4dc7895f5dfa121ad6b;hp=1234474396cab62da1f83b97e1c97b031b852636;hpb=78a1427fc167ccee73d448054a9c40c19d737ed3;p=automated-distro-installer diff --git a/fai/config/scripts/GRUB_PC/11-iank b/fai/config/scripts/GRUB_PC/11-iank index 1234474..d8fb48d 100755 --- a/fai/config/scripts/GRUB_PC/11-iank +++ b/fai/config/scripts/GRUB_PC/11-iank @@ -12,18 +12,14 @@ if ! type -t fcopy &>/dev/null; then sudo apt-get -y install fai-client fi -chroot $FAI_ROOT bash <<'EOFOUTER' -set -eE -o pipefail -if getent group systemd-journal >/dev/null; then - # makes the journal be saved to disk. - mkdir -p /var/log/journal - chmod 755 /var/log/journal +if [[ -e /a/bin/fai/fai-wrapper ]]; then + chroot() { + shift + "$@" + } fi -debconf-set-selections < 60*60*2 )); then fi -chroot $FAI_ROOT bash <<'EOF' + +#### misc configurations +chroot $FAI_ROOT bash <<'EOFOUTER' +if getent group systemd-journal >/dev/null; then + # makes the journal be saved to disk. + mkdir -p /var/log/journal + chmod 755 /var/log/journal +fi +debconf-set-selections <$FAI_ROOT/etc/grub.d/40_custom </etc/initramfs-tools/modules -update-initramfs -u -k all -EOF - fi -fi +fi ##### end != dirinstall # reading through the groups that iank is in but user2 isn't, for g in plugdev audio video cdrom; do $ROOTCMD usermod -a -G $g user2 done + + + +###### begin network setup #### + +# use old names. the idea of them changing between boots has never +# happened to me and I usually only have 1 wired or other type. +# If I ever do need to care about it, I will. +# Strangely this didn't work on kw, so I added kernel cmdline parameter. +# https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames/ +ln -sf /dev/null $target/etc/systemd/network/99-default.link + +# use networkmanager if this host has wireless. +if [[ $(iw dev) ]]; then + chroot $FAI_ROOT bash <$target/etc/NetworkManager/conf.d/99-iank.conf <<'EOF' +[main] +dns=systemd-resolved +EOF + +else + cat > $target/etc/network/interfaces <<-EOF +# generated by FAI +auto lo eth0 +iface lo inet loopback +iface eth0 inet dhcp +iface eth0 inet6 auto +EOF + + # previously had an else condition after + #elif ifclass VM || ifclass LINODE; then + # iface $NIC1 inet manual + # iface br0 inet dhcp + # bridge_ports $NIC1 + # bridge_stp off + # bridge_maxwait 0 + # however, on t9, on startup, br0, became + # rename1 and didn't come up. i dunno why, + # but the bridge is for vms that I rarely use, + # so not bothering to figure it out. + + +fi + +rm -f $target/etc/resolv.conf +ln -s ../run/systemd/resolve/stub-resolv.conf $target/etc/resolv.conf + +if ifclass LINODE; then + mkdir -p $target/etc/initramfs-tools/conf.d + cat >$target/etc/initramfs-tools/conf.d/mine <