arch use by-id and various fixes

[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 d22d8fc852df9bf871c15cecdd1627116dfbc74a..9764d8e5f10f5864f4eee7f67a1c3ce3cfce7e8f 100755 (executable)
--- a/fai/config/scripts/GRUB_PC/11-ian
+++ b/fai/config/scripts/GRUB_PC/11-ian
@@ -4,6 +4,12 @@ set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' 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
@@ -16,13 +22,19 @@ if ifclass DEBIAN; then
 fi
 
 
-# -i, ignore nonmatching class error, always return 0.
-fcopy -r -M -i /home/ian/.ssh
+# 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
+fi
 /var/lib/fai/config/distro-install-common/end
 
 rm -f /target/etc/apt/sources.list
 
 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
@@ -41,3 +53,16 @@ if ifclass STABLE; then
     # 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