rename secondary user

diff --git a/fai/config/distro-install-common/end b/fai/config/distro-install-common/end
index a6bc1137c56721a1eebee75080c4afd22b31188a..8ae323c7c805ccb68cb61a9979a57bd33df50475 100755 (executable)
--- 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 d896a94d6e2e67a441e32e3446c0f16411b43bfe..a09b779629407f6f9466e4edc341021a717c0408 100755 (executable)
--- 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 7270d65902c34047432fa89a4176508d20df3ad4..d7534d5551ceb462ced9b8f4815022adf0f4b526 100755 (executable)
--- 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