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
various fixes, improve flidas
[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 90082de579047090c387b05f944cb5f710e9cb80..d10b9497d11d3ac2b4f07098e780b0567e7c30ae 100755
(executable)
--- a/
fai/config/distro-install-common/end
+++ b/
fai/config/distro-install-common/end
@@
-51,16
+51,18
@@
au() { # add user
chpw root "$ROOTPW"
# 9 = user already exists. so we are idempotent.
chpw root "$ROOTPW"
# 9 = user already exists. so we are idempotent.
-au ian
-chpw ian "$ROOTPW"
+au ian
k
+chpw ian
k
"$ROOTPW"
au traci
if ifclass frodo; then
chpw traci "$TPW"
fi
au traci
if ifclass frodo; then
chpw traci "$TPW"
fi
-# comparing ian's groups to traci, I see none she should join on arch
-$ROOTCMD usermod -a -G traci ian
+# comparing ian
k
's groups to traci, I see none she should join on arch
+$ROOTCMD usermod -a -G traci ian
k
+$ROOTCMD getent group docker &>/dev/null || $ROOTCMD groupadd -r docker
+$ROOTCMD usermod -a -G docker iank
# based on unison error, with 8192 from
# sysctl -a | grep fs.inotify.max_user_watches
# based on unison error, with 8192 from
# sysctl -a | grep fs.inotify.max_user_watches
@@
-74,7
+76,7
@@
echo "fs.inotify.max_user_watches = 1000000" >> $f
$ROOTCMD sysctl --system
f=$target/etc/sudoers
$ROOTCMD sysctl --system
f=$target/etc/sudoers
-line='ian ALL=(ALL) NOPASSWD: ALL'
+line='ian
k
ALL=(ALL) NOPASSWD: ALL'
if [[ ! -e $f ]] || ! grep -xF "$line" $f; then
echo "$line" >> $f
fi
if [[ ! -e $f ]] || ! grep -xF "$line" $f; then
echo "$line" >> $f
fi
@@
-94,4
+96,4
@@
while true; do
if [[ $dir == /p ]]; then break; fi
done
if [[ $dir == /p ]]; then break; fi
done
-au -s /bin/false --home-dir /var/lib/bitcoind bitcoin
+au -
-system -
s /bin/false --home-dir /var/lib/bitcoind bitcoin