refs #197 Code cleanup
parent
bb440428de
commit
0a49e79683
|
@ -5,7 +5,6 @@
|
|||
####### Autor: Luis Guillén <lguillen@unizar.es>
|
||||
#####################################################################
|
||||
|
||||
|
||||
#####################################################################
|
||||
####### Funciones de configuración
|
||||
#####################################################################
|
||||
|
@ -39,7 +38,6 @@ function userData ()
|
|||
DEFAULT_OGLIVE="ogLive-bionic-5.4.0-40-generic-amd64-r20200629.85eceaf.iso " # Cliente ogLive
|
||||
|
||||
echo -e "\\nOpenGnsys Installation"
|
||||
echo "=============================="
|
||||
|
||||
if [[ $- =~ s ]]; then
|
||||
echo -e "\\nNot interactive mode: setting default configuration values.\\n"
|
||||
|
@ -491,14 +489,12 @@ function downloadCode()
|
|||
local url="$1"
|
||||
|
||||
echoAndLog "${FUNCNAME}(): downloading code..."
|
||||
echo "======================///////////////////////////////////////==============================="
|
||||
echo "Current PATH: $(pwd)"
|
||||
curl "${url}" -o opengnsys.zip && unzip -q opengnsys.zip && mv "OpenGnsys-${BRANCH#v}" ogboot
|
||||
if [ $? -ne 0 ]; then
|
||||
errorAndLog "${FUNCNAME}(): error getting OpenGnsys code from $url"
|
||||
return 1
|
||||
fi
|
||||
echo "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"
|
||||
rm -f opengnsys.zip
|
||||
echoAndLog "${FUNCNAME}(): code was downloaded"
|
||||
return 0
|
||||
|
@ -719,7 +715,6 @@ function dhcpConfigure()
|
|||
for dev in ${DEVICE[*]}; do
|
||||
if [ -n "${SERVERIP[i]}" ]; then
|
||||
backupFile $DHCPCFGDIR/dhcpd-$dev.conf
|
||||
echo "1==========================================="
|
||||
sed -e "s/SERVERIP/${SERVERIP[i]}/g" \
|
||||
-e "s/NETIP/${NETIP[i]}/g" \
|
||||
-e "s/NETMASK/${NETMASK[i]}/g" \
|
||||
|
@ -728,7 +723,6 @@ function dhcpConfigure()
|
|||
-e "s/DNSIP/$DNSIP/g" \
|
||||
$WORKDIR/ogboot/server/etc/dhcpd.conf.tmpl > $DHCPCFGDIR/dhcpd-$dev.conf || errcode=1
|
||||
echo "$WORKDIR/ogboot/server/etc/dhcpd.conf.tmpl"
|
||||
echo "2==========================================="
|
||||
fi
|
||||
let i++
|
||||
done
|
||||
|
|
Loading…
Reference in New Issue