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
code cleanup, arch fixes
[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 6afcd1eaf5f75cf22e52b8893679b74cd92b352a..bc4e816bad77d2e36f3e88548421a1f71a474eed 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"
@@
-34,12
+27,12
@@
chpw() {
if [[ $pwfile && -e $pwfile ]]; then
printf "$user:" | cat - "$pwfile" | $ROOTCMD chpasswd -e
else
if [[ $pwfile && -e $pwfile ]]; then
printf "$user:" | cat - "$pwfile" | $ROOTCMD chpasswd -e
else
- echo "$0: warning: no pw set for $user"
+ echo "$0: warning: no pw set for $user"
>&2
fi
}
fi
}
-au() {
- if ! $ROOTCMD getent passwd $
1
; then
- $ROOTCMD useradd -m -s /bin/bash $
1 || [[ $? == 9 ]]
+au() {
# add user
+ if ! $ROOTCMD getent passwd $
{@: -1}
; then
+ $ROOTCMD useradd -m -s /bin/bash $
@
fi
}
fi
}
@@
-74,18
+67,19
@@
if [[ ! -e $f ]] || ! grep -xF "$line" $f; then
fi
fi
-dir=/
q/
p/c/machine_specific/$HOSTNAME/.unison
+dir=/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 mkdir -p $dir
if ! $ROOTCMD test -L /root/.unison; then
$ROOTCMD rm -rf /root/.unison
$ROOTCMD ln -s -T $dir /root/.unison
fi
-$ROOTCMD ln -sf /q/p /
$ROOTCMD chown -R 1000:1000 $dir
while true; do
$ROOTCMD chown 1000:1000 $dir
$ROOTCMD chmod 700 $dir
dir=$(dirname $dir)
$ROOTCMD chown -R 1000:1000 $dir
while true; do
$ROOTCMD chown 1000:1000 $dir
$ROOTCMD chmod 700 $dir
dir=$(dirname $dir)
- [[ $dir != /q ]] || break
+ if [[ $dir == /p ]]; then break; fi
done
done
+
+au -s /bin/false --home-dir /var/lib/bitcoind bitcoin