Compare commits

..

No commits in common. "7bd6e197ab2f1019e1b554655dada6cd171aa00b" and "a4a818721ad3a01f99616844b082b66528039ba6" have entirely different histories.

3 changed files with 2 additions and 7 deletions

View File

@ -119,9 +119,7 @@ fillsection(){ (
ct2hostname(){ ct2hostname(){
local ct=${CT_DIR}/${1}.conf local ct=${CT_DIR}/${1}.conf
local host=$(cat $ct \ local host=$(cat $ct | grep hostname | head -1)
| grep -e '^\s*hostname:' \
| head -1)
echo ${host/hostname: /} echo ${host/hostname: /}
} }

View File

@ -106,9 +106,6 @@ echo "# Building config..."
buildAssets buildAssets
# XXX /etc/hosts???
# DNS # DNS
if xreadYes "# Update DNS?" DNS ; then if xreadYes "# Update DNS?" DNS ; then
file=/etc/resolv.conf file=/etc/resolv.conf

View File

@ -23,7 +23,7 @@ fi
for ct in $CT_DIR/*.conf ; do for ct in $CT_DIR/*.conf ; do
id=$(basename ${ct/.conf/}) id=$(basename ${ct/.conf/})
host=$(ct2hostname) host=$(cat $ct | grep hostname | head -1)
host=${host/hostname: /} host=${host/hostname: /}
# skip templates... # skip templates...