iankelling.org
/
git
/
automated-distro-installer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more comprehensive local dns records
[automated-distro-installer]
/
fai
/
config
/
distro-install-common
/
end
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
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
else
ROOTPW=/q/root/shadow/standard
fi
@@
-58,12
+57,12
@@
fi
au iank
chpw iank "$ROOTPW"
au iank
chpw iank "$ROOTPW"
-au
traci
+au
user2
if ifclass frodo; then
if ifclass frodo; then
- chpw
traci "$T
PW"
+ chpw
user2 "$USER2
PW"
fi
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
$ROOTCMD getent group docker &>/dev/null || $ROOTCMD groupadd -r docker