X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fscripts%2FGRUB_PC%2F11-ian;h=11cd818d50df43b2130ed64bf08608cf9bb79e39;hb=f6b9ade60186b7be2ecf39266ced982ec7efc633;hp=5dc250a74faf494db0fe33cf598c5197ec0b8e5d;hpb=afabe0c27af744200aa6b6e05c5b2ab7d7518c1e;p=automated-distro-installer

diff --git a/fai/config/scripts/GRUB_PC/11-ian b/fai/config/scripts/GRUB_PC/11-ian
index 5dc250a..11cd818 100755
--- a/fai/config/scripts/GRUB_PC/11-ian
+++ b/fai/config/scripts/GRUB_PC/11-ian
@@ -3,40 +3,50 @@
 set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
-$ROOTCMD adduser --disabled-password --gecos ian ian
-
-if [[ ! $ROOTPW ]]; then
-    echo "$0: error: empty \$ROOTPW"
+if [[ $EUID != 0 ]]; then
+    echo "$0: error: expected to be root."
     exit 1
 fi
 
-$ROOTCMD usermod -p "$ROOTPW" ian
+if ! type -t fcopy &>/dev/null; then
+    sudo apt-get -y install fai-client
+fi
+
+dir=/q/root/shadow
+fai_shadow=$FAI/distro-install-common/shadow
+if [[ ! -e $dir && -e $fai_shadow ]]; then
+    mkdir -p $dir
+    mount -o bind $fai_shadow $dir
+fi
+$FAI/distro-install-common/end
 
-if ifclass STABLE; then
+if ifclass STABLE || ifclass LINODESTABLE; then
     fcopy -M /etc/apt/preferences
 fi
 
 if ifclass DEBIAN; then
     fcopy -M /etc/apt/preferences.d/unstable
-    fcopy -riM /etc/apt/sources.list.d
 fi
+fcopy -riM /etc/apt/sources.list.d
+$ROOTCMD apt-get update
+
 
 
 # note:
 # fcopy -i = ignore nonmatching class error, always return 0.
 
-f=/target/home/ian/.ssh/authorized_keys
-if [[ ! -L $f || -e $f ]]; then
-    fcopy -r -M /home/ian/.ssh
-else
-    echo "$0: info: $f exists"
-fi
-/var/lib/fai/config/distro-install-common/end
+# for lj, this will be empty and fail
+fcopy -riM /home/ian/.ssh
 
-rm -f /target/etc/apt/sources.list
+rm -f $FAI_ROOT/etc/apt/sources.list
 
-chroot /target bash <<'EOF'
+chroot $FAI_ROOT bash <<'EOF'
 set -eE -o pipefail
+mkdir -p /home/ian/.ssh
+f=/root/.ssh/authorized_keys
+if [[ -e $f ]]; then
+   cp $f /home/ian/.ssh
+fi
 chown -R 1000:1000 /home/ian/.ssh
 chmod -R u=Xrw,og= /home/ian/.ssh
 rm -rf /root/.ssh
@@ -44,34 +54,27 @@ cp -rL /home/ian/.ssh /root
 chown -R root:root /root/.ssh
 chmod 700 /root/.ssh
 
-# default jessie groups + kvm & systemd-journal
-usermod -aG cdrom,floppy,sudo,audio,dip,video,plugdev,netdev,systemd-journal ian
+# default jessie groups + kvm, systemd-journal, adm
+usermod -aG adm,cdrom,floppy,sudo,audio,dip,video,plugdev,netdev,systemd-journal ian
+
+# 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
 
 
-$ROOTCMD apt-get -y install unison-gtk
-if ifclass STABLE; then
-    # don't think this is needed since I figured out how to
-    # deal with mismatching unison compilers, but I don't
-    # see any reason to revert it, since it only installs
-    # a single package which is primarily a single binary
-    $ROOTCMD apt-get -y install unison-gtk/testing
-fi
-
-
-
-$ROOTCMD adduser --disabled-password --gecos traci traci
-$ROOTCMD usermod -a -G traci ian
 # reading through the groups that ian is in but traci isn't,
 for g in plugdev audio video cdrom; do
     $ROOTCMD usermod -a -G $g traci
 done
 
-if ifclass frodo; then
-    $ROOTCMD usermod -p "$(cat /var/lib/fai/config/distro-install-common/traci-simple)" traci
-fi
-
-
 # makes the journal be saved to disk.
-$ROOTCMD mkdir -p /target/var/log/journal
-$ROOTCMD chmod 755 /target/var/log/journal
+$ROOTCMD mkdir -p $FAI_ROOT/var/log/journal
+$ROOTCMD chmod 755 $FAI_ROOT/var/log/journal