add support for trisquel belanos

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

diff --git a/fai/config/scripts/GRUB_PC/11-ian b/fai/config/scripts/GRUB_PC/11-ian
index 5d064be41bfa8593539c54ac1e1d9d65ee494c8d..e27e394e8ac3509032d1ab194fc8c35812ebee92 100755 (executable)
--- a/fai/config/scripts/GRUB_PC/11-ian
+++ b/fai/config/scripts/GRUB_PC/11-ian
@@ -26,9 +26,10 @@ fi
 
 if ifclass DEBIAN; then
     fcopy -M /etc/apt/preferences.d/unstable
-    fcopy -riM /etc/apt/sources.list.d
-    $ROOTCMD apt-get update
 fi
+fcopy -riM /etc/apt/sources.list.d
+$ROOTCMD apt-get update
+
 
 
 # note:
@@ -53,8 +54,26 @@ cp -rL /home/ian/.ssh /root
 chown -R root:root /root/.ssh
 chmod 700 /root/.ssh
 
+
 # default jessie groups + kvm, systemd-journal, adm
-usermod -aG adm,cdrom,floppy,sudo,audio,dip,video,plugdev,netdev,systemd-journal ian
+usermod -aG adm,cdrom,floppy,sudo,audio,dip,video,plugdev,netdev ian
+
+if getent group systemd-journal >/dev/null; then
+  usermod -aG systemd-journal ian
+  # makes the journal be saved to disk.
+  mkdir -p /var/log/journal
+  chmod 755 /var/log/journal
+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
 EOF
 
 
@@ -63,6 +82,3 @@ for g in plugdev audio video cdrom; do
     $ROOTCMD usermod -a -G $g traci
 done
 
-# makes the journal be saved to disk.
-$ROOTCMD mkdir -p $FAI_ROOT/var/log/journal
-$ROOTCMD chmod 755 $FAI_ROOT/var/log/journal