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 minor fixes and improvements
[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 3b07687d9fa636c897891def4c4305ab5051d149..a7745b7bbf44241512822648706470b00fe0d0e5 100755
(executable)
--- a/
fai/config/distro-install-common/end
+++ b/
fai/config/distro-install-common/end
@@
-17,13
+17,14
@@
if [[ -e $src && -e $dst ]]; then
cp -rT $src $dst
fi
cp -rT $src $dst
fi
-if ifclass VOL_ST
ABLE
_BOOTSTRAP; then
+if ifclass VOL_ST
RETCH
_BOOTSTRAP; then
exit 0
fi
TPW=/q/root/shadow/traci-simple
if ifclass tp; then
exit 0
fi
TPW=/q/root/shadow/traci-simple
if ifclass tp; then
- ROOTPW="$TPW"
+ ROOTPW=/q/root/shadow/standard
+# ROOTPW="$TPW"
else
ROOTPW=/q/root/shadow/standard
fi
else
ROOTPW=/q/root/shadow/standard
fi
@@
-43,26
+44,26
@@
chpw() {
echo "$0: warning: no pw set for $user" >&2
fi
}
echo "$0: warning: no pw set for $user" >&2
fi
}
-au() { # add user
+au() { # add user
. i don't use adduser for portability
if ! $ROOTCMD getent passwd ${@: -1}; then
if ! $ROOTCMD getent passwd ${@: -1}; then
- $ROOTCMD useradd -m -s /bin/bash $@
+ $ROOTCMD useradd -
U
m -s /bin/bash $@
fi
}
chpw root "$ROOTPW"
# 9 = user already exists. so we are idempotent.
fi
}
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
-
getent group docker &>/dev/null ||
groupadd -r docker
-usermod -a -G docker ian
+
$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
@@
-76,7
+77,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
@@
-96,4
+97,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