From 174c1cfe0febff17f3bd75dc7d3c6ce2731e9bd2 Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Tue, 8 Feb 2022 18:21:20 -0500 Subject: [PATCH] minor fixes --- fai/config/hooks/partition.DEFAULT | 9 +++++---- fai/config/scripts/GRUB_PC/11-iank | 18 ++---------------- 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT index 80f0d7c..19b8023 100755 --- a/fai/config/hooks/partition.DEFAULT +++ b/fai/config/hooks/partition.DEFAULT @@ -360,8 +360,8 @@ if (( boot_space > 60000 )); then # becuase I keep a minimal debian install on it for # recovery needs and for doing pxe-kexec. boot_mib=10000 - root2_mib=200000 - boot2_mib=2000 + root2_mib=1000000 + boot2_mib=5000 elif (( boot_spa_ce > 30000 )); then boot_mib=$(( 5000 + (boot_space - 30000) / 2 )) root2_mib=100 @@ -369,8 +369,9 @@ elif (( boot_spa_ce > 30000 )); then else # Small vms don't have room for /boot recovery. With 3 kernels # installed, i'm using 132M on t8, so this seems like plenty of - # room. note: rhel 8 recomments 1g for /boot. - boot_mib=500 + # room. note: rhel 8 recomments 1g for /boot. u20.04 with 3 kernels = + # 308 mb, so things have grown significantly + boot_mib=1000 root2_mib=100 boot2_mib=100 fi diff --git a/fai/config/scripts/GRUB_PC/11-iank b/fai/config/scripts/GRUB_PC/11-iank index 93df655..eb315ce 100755 --- a/fai/config/scripts/GRUB_PC/11-iank +++ b/fai/config/scripts/GRUB_PC/11-iank @@ -353,22 +353,8 @@ fi # appropriate things into a new service. rm -f /home/iank/.config/systemd/user/default.target.wants/ssh-agent.service -mkdir -p /home/iank/.local/share/systemd/user -cat >/home/iank/.local/share/systemd/user/sshaiank.service <<'EOF' -[Unit] -Description=OpenSSH User Agent -Documentation=man:ssh-agent(1) -[Service] -ExecStart=/usr/lib/openssh/agent-launch start -ExecStopPost=/usr/lib/openssh/agent-launch stop -[Install] -WantedBy=default.target -EOF -# enable it -# systemctl --user is not available at fai time, so create the link ourselves -dir=/home/iank/.config/systemd/user/default.target.wants -mkdir -p $dir -ln -sf /home/iank/.local/share/systemd/user/sshaiank.service $dir +rm -f /home/iank/.local/share/systemd/user/sshaiank.service \ + /home/iank/.config/systemd/user/default.target.wants/sshaiank.service #### end .ssh setup ### -- 2.30.2