X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fscripts%2FGRUB_PC%2F11-ian;h=bdfa275d85e424e7d9d1f505fc43654576a3a5f8;hb=a8ec695d6a39792133a21e9eca70e69f9fab107b;hp=6823a0bcec29748ffab1986226ee0e901f2803a8;hpb=08420220e949029a0d2e211edcc93c0701b23429;p=automated-distro-installer

diff --git a/fai/config/scripts/GRUB_PC/11-ian b/fai/config/scripts/GRUB_PC/11-ian
index 6823a0b..bdfa275 100755
--- a/fai/config/scripts/GRUB_PC/11-ian
+++ b/fai/config/scripts/GRUB_PC/11-ian
@@ -1,29 +1,68 @@
 #!/bin/bash -x
 
 set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
+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"
+    exit 1
+fi
+
 $ROOTCMD usermod -p "$ROOTPW" ian
 
 if ifclass STABLE; 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
+
+
+# note:
+# fcopy -i = ignore nonmatching class error, always return 0.
 
-# -i, ignore nonmatching class error, always return 0.
-fcopy -r -M -i /home/ian/.ssh
+f=/target/home/ian/.ssh/authorized_keys
+if [[ ! -L $f || -e $f ]]; then
+    fcopy -r -M /home/ian/.ssh
+fi
 /var/lib/fai/config/distro-install-common/end
 
+rm -f /target/etc/apt/sources.list
 
-# could also use: chroot /target script-file
-$ROOTCMD chown -R 1000:1000 /home/ian/.ssh
-$ROOTCMD chmod -R u=Xrw,og= /home/ian/.ssh
-$ROOTCMD cp -ar /home/ian/.ssh /root
-$ROOTCMD chown -R root:root /root/.ssh
+chroot /target bash <<'EOF'
+set -eE -o pipefail
+chown -R 1000:1000 /home/ian/.ssh
+chmod -R u=Xrw,og= /home/ian/.ssh
+cp -ar /home/ian/.ssh /root
+chown -R root:root /root/.ssh
 
 # default jessie groups + kvm & systemd-journal
-$ROOTCMD usermod -aG cdrom,floppy,sudo,audio,dip,video,plugdev,netdev,kvm,systemd-journal ian
+usermod -aG cdrom,floppy,sudo,audio,dip,video,plugdev,netdev,kvm,systemd-journal ian
+EOF
 
 
-$ROOTCMD apt-get -y install unison/testing
+$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/shadow/traci-simple)" traci
+fi