various fixes

[automated-distro-installer] / fai / config / scripts / GRUB_PC / 11-iank

diff --git a/fai/config/scripts/GRUB_PC/11-iank b/fai/config/scripts/GRUB_PC/11-iank
index 60403dd58e907d3b698f4bae58f1b64337ad7a9e..0df904b6cf85f0f6fa3ceb9073058f5c11a8f9da 100755 (executable)
--- a/fai/config/scripts/GRUB_PC/11-iank
+++ b/fai/config/scripts/GRUB_PC/11-iank
@@ -61,6 +61,7 @@ $ROOTCMD apt-get update
 
 
 chroot $FAI_ROOT bash <<'EOF'
+#### begin .ssh setup ###
 set -eE -o pipefail
 mkdir -p /home/iank/.ssh
 f=/root/.ssh/authorized_keys
@@ -70,10 +71,16 @@ fi
 chown -R 1000:1000 /home/iank/.ssh
 chmod -R u=Xrw,og= /home/iank/.ssh
 rm -rf /root/.ssh
+# remove broken symlinks or the following cp will fail
+find /home/iank/.ssh -xtype l -exec rm '{}' \;
 cp -rL /home/iank/.ssh /root
 chown -R root:root /root/.ssh
 chmod 700 /root/.ssh
+#### end .ssh setup ###
 
+# this is needed to enable resolvconf, making /etc/resolv.conf be a symlink.
+# why? i dun know, it\'s really  dumb.
+dpkg-reconfigure -fnoninteractive resolvconf
 
 # default jessie groups + kvm, systemd-journal, adm
 usermod -aG adm,cdrom,floppy,sudo,audio,dip,video,plugdev,netdev iank
@@ -81,16 +88,7 @@ usermod -aG adm,cdrom,floppy,sudo,audio,dip,video,plugdev,netdev iank
 if getent group systemd-journal >/dev/null; then
   usermod -aG systemd-journal iank
 fi
-# https://askubuntu.com/questions/33416/how-do-i-disable-the-boot-splash-screen-and-only-show-kernel-and-boot-text-inst
-# it suggests not having plymouth-theme-ubuntu-text, but
-# making it not installed then kills plymouth, then makes
-# the system not boot.
-sed -ri 's/(^ *GRUB_CMDLINE_LINUX.*)quiet splash/\1/' /etc/default/grub
-# on xenial, no grub is displayed at all. fix that.
-# found just by noticing this in the config file, and a
-# warning about it in error.log
-sed -i '/^ *GRUB_HIDDEN_TIMEOUT/d' /etc/default/grub
-update-grub2
+
 
 # this is usefull. Only thing reason I see this being disabled by default is
 # that a normal user can disrupt the system, eg cause a reboot.
@@ -99,6 +97,23 @@ sed -i '$a kernel.sysrq=1
 EOF
 
 
+if [[ $FAI_ACTION != dirinstall ]]; then
+   chroot $FAI_ROOT bash <<'EOF'
+   # https://askubuntu.com/questions/33416/how-do-i-disable-the-boot-splash-screen-and-only-show-kernel-and-boot-text-inst
+   # it suggests not having plymouth-theme-ubuntu-text, but
+   # making it not installed then kills plymouth, then makes
+   # the system not boot.
+   sed -ri 's/(^ *GRUB_CMDLINE_LINUX.*)quiet splash/\1/' /etc/default/grub
+   # on xenial, no grub is displayed at all. fix that.
+   # found just by noticing this in the config file, and a
+   # warning about it in error.log
+   sed -i '/^ *GRUB_HIDDEN_TIMEOUT/d' /etc/default/grub
+
+   update-grub2
+EOF
+fi
+
+
 # reading through the groups that iank is in but traci isn't,
 for g in plugdev audio video cdrom; do
     $ROOTCMD usermod -a -G $g traci