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
[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..6be266ebacfedd9b4e8a61d0b9bd14ece91a0267 100755
(executable)
--- a/
fai/config/distro-install-common/end
+++ b/
fai/config/distro-install-common/end
@@
-9,9
+9,9
@@
if [[ $EUID != 0 ]]; then
fi
### begin set hostname
fi
### begin set hostname
-echo $
hostname
> /etc/hostname
+echo $
HOSTNAME
> /etc/hostname
sed -i '/^127\.0\.1\.1/d' /etc/hosts
sed -i '/^127\.0\.1\.1/d' /etc/hosts
-echo "127.0.1.1 $
hostname
" >> /etc/hosts
+echo "127.0.1.1 $
HOSTNAME
" >> /etc/hosts
hostname -F /etc/hostname
### end set hostname
hostname -F /etc/hostname
### end set hostname
@@
-33,19
+33,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
@@
-80,10
+77,7
@@
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
-$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