From b231c7038b1d0b6143f14a1a5efb90cd62aae876 Mon Sep 17 00:00:00 2001
From: Ian Kelling <iank@fsf.org>
Date: Wed, 3 Jul 2019 09:59:11 -0400
Subject: [PATCH] rename secondary user

---
 fai/config/distro-install-common/end | 15 +++++++--------
 fai/config/hooks/partition.DEFAULT   |  3 +++
 fai/config/scripts/GRUB_PC/11-iank   |  4 ++--
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/fai/config/distro-install-common/end b/fai/config/distro-install-common/end
index a6bc113..8ae323c 100755
--- a/fai/config/distro-install-common/end
+++ b/fai/config/distro-install-common/end
@@ -17,10 +17,9 @@ if [[ -e $src && -e $dst ]]; then
   cp -rT $src $dst
 fi
 
-TPW=/q/root/shadow/traci-simple
-if ifclass tp; then
-  ROOTPW=/q/root/shadow/standard
-  #    ROOTPW="$TPW"
+USER2PW=/q/root/shadow/user2
+if ifclass ziva; then
+  ROOTPW=/q/root/shadow/ziva
 else
   ROOTPW=/q/root/shadow/standard
 fi
@@ -58,12 +57,12 @@ fi
 au iank
 chpw iank "$ROOTPW"
 
-au traci
+au user2
 if ifclass frodo; then
-  chpw traci "$TPW"
+  chpw user2 "$USER2PW"
 fi
-# comparing iank's groups to traci, I see none she should join on arch
-$ROOTCMD usermod -a -G traci iank
+# comparing iank's groups to user2, I see none she should join on arch
+$ROOTCMD usermod -a -G user2 iank
 
 
 $ROOTCMD getent group docker &>/dev/null || $ROOTCMD groupadd -r docker
diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT
index d896a94..a09b779 100755
--- a/fai/config/hooks/partition.DEFAULT
+++ b/fai/config/hooks/partition.DEFAULT
@@ -294,6 +294,9 @@ lukspw=$(cat $luks_dir/iank)
 if ifclass tpnew; then
   lukspw=$(cat $luks_dir/traci)
 fi
+if ifclass ziva; then
+  lukspw=$(cat $luks_dir/ziva)
+fi
 if ifclass demohost; then
   lukspw=x
 fi
diff --git a/fai/config/scripts/GRUB_PC/11-iank b/fai/config/scripts/GRUB_PC/11-iank
index 7270d65..d7534d5 100755
--- a/fai/config/scripts/GRUB_PC/11-iank
+++ b/fai/config/scripts/GRUB_PC/11-iank
@@ -134,7 +134,7 @@ EOF
 fi
 
 
-# reading through the groups that iank is in but traci isn't,
+# reading through the groups that iank is in but user2 isn't,
 for g in plugdev audio video cdrom; do
-    $ROOTCMD usermod -a -G $g traci
+    $ROOTCMD usermod -a -G $g user2
 done
-- 
2.30.2