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
fixup initial faiserver bootstrap & small bugs
[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 b55295232e614959ff7daf2ba16c302fe9c086ab..c68be2cbd5fcededa47b0e83a6a9b50030fac1b4 100755
(executable)
--- a/
fai/config/distro-install-common/end
+++ b/
fai/config/distro-install-common/end
@@
-8,13
+8,6
@@
if [[ $EUID != 0 ]]; then
exit 1
fi
exit 1
fi
-### begin set hostname
-echo $hostname > /etc/hostname
-sed -i '/^127\.0\.1\.1/d' /etc/hosts
-echo "127.0.1.1 $hostname" >> /etc/hosts
-hostname -F /etc/hostname
-### end set hostname
-
TPW=/q/root/shadow/traci-simple
if ifclass tp; then
ROOTPW="$TPW"
TPW=/q/root/shadow/traci-simple
if ifclass tp; then
ROOTPW="$TPW"
@@
-33,19
+26,16
@@
chpw() {
pwfile=$2
if [[ $pwfile && -e $pwfile ]]; then
printf "$user:" | cat - "$pwfile" | $ROOTCMD chpasswd -e
pwfile=$2
if [[ $pwfile && -e $pwfile ]]; then
printf "$user:" | cat - "$pwfile" | $ROOTCMD chpasswd -e
-
else
-
echo "$0: warning: no pw set for $user"
+ else
+ echo "$0: warning: no pw set for $user"
fi
}
au() {
if ! $ROOTCMD getent passwd $1; then
fi
}
au() {
if ! $ROOTCMD getent passwd $1; then
- $ROOTCMD useradd -m
$1 -s /bin/bash
|| [[ $? == 9 ]]
+ $ROOTCMD useradd -m
-s /bin/bash $1
|| [[ $? == 9 ]]
fi
}
fi
}
-echo "IANNNNNNN 222222222, $ROOTPW"
-ls -la $ROOTPW
-
chpw root "$ROOTPW"
# 9 = user already exists. so we are idempotent.
au ian
chpw root "$ROOTPW"
# 9 = user already exists. so we are idempotent.
au ian
@@
-65,7
+55,7
@@
$ROOTCMD usermod -a -G traci ian
f=$target/etc/sysctl.d/99-sysctl.conf
key=fs.inotify.max_user_watches
f=$target/etc/sysctl.d/99-sysctl.conf
key=fs.inotify.max_user_watches
-if [[ -e $f ]]; then sed -ri "/^\s*$key\s*=/d" $f; fi
+if [[ -e $f ]]; then sed -ri
--follow-symlinks
"/^\s*$key\s*=/d" $f; fi
echo "fs.inotify.max_user_watches = 1000000" >> $f
# applies it. it would be also be applied after a reboot
$ROOTCMD sysctl --system
echo "fs.inotify.max_user_watches = 1000000" >> $f
# applies it. it would be also be applied after a reboot
$ROOTCMD sysctl --system
@@
-79,11
+69,12
@@
fi
dir=/q/p/c/machine_specific/$HOSTNAME/.unison
$ROOTCMD mkdir -p $dir
dir=/q/p/c/machine_specific/$HOSTNAME/.unison
$ROOTCMD mkdir -p $dir
+if ! $ROOTCMD test -L /root/.unison; then
+ $ROOTCMD rm -rf /root/.unison
+ $ROOTCMD ln -s -T $dir /root/.unison
+fi
-$ROOTCMD rm -rf /root/.unison
-$ROOTCMD ln -sf $dir /root
$ROOTCMD ln -sf /q/p /
$ROOTCMD ln -sf /q/p /
-
$ROOTCMD chown -R 1000:1000 $dir
while true; do
$ROOTCMD chown 1000:1000 $dir
$ROOTCMD chown -R 1000:1000 $dir
while true; do
$ROOTCMD chown 1000:1000 $dir