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
fix chboot, add partition options
[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 390c20487c4c944b4dfd96a81d1b13b313f33eca..d226af6ce85e826af2a55e5f3a0f7ea75fc5d8a4 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,7
+27,7
@@
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
}
au() {
fi
}
au() {
@@
-76,6
+69,10
@@
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 ln -sf /q/p /
$ROOTCMD chown -R 1000:1000 $dir
$ROOTCMD ln -sf /q/p /
$ROOTCMD chown -R 1000:1000 $dir