fatalerrors/init.sh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

corrected some syntax errors

Browse Source
This commit is contained in:
levasseur
2021-12-17 16:42:19 +01:00
parent c5051c15f2
commit 0f70c955e0
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/zzz_main_fct.sh
View File

@@ -297,7 +297,7 @@ process_commandline_and_vars()
# Check for module list existance and basic syntax # Check for module list existance and basic syntax
if [[ -n $MODULE_LIST ]]; then if [[ -n $MODULE_LIST ]]; then
for $mod in $MODULE_LIST; do for $mod in $MODULE_LIST; do
if [[ $mod =~ ['\"\'\ \\-!@#$%&*=+'] ]]; then if [[ $mod =~ ['-!@#$%\&*=+'] ]]; then
prnt E "The module \"$mod\" contains a forbidden character in its name." prnt E "The module \"$mod\" contains a forbidden character in its name."
die 5 die 5
fi fi

9
modules/conf_network.sh
View File

@@ -33,7 +33,7 @@ conf_network()
# First configure IPv4 ifaces # First configure IPv4 ifaces
local iface= local iface=
for iface in $IPV4_IFACES; then for iface in $IPV4_IFACES; do
echo -e "\n# --------------------------------\n" >> $if_file echo -e "\n# --------------------------------\n" >> $if_file
if [[ $(eval echo \$NET4_MODE_$iface) == manual ]]; then if [[ $(eval echo \$NET4_MODE_$iface) == manual ]]; then
prnt I "Configuring IPv4 network interface $iface in static mode..." prnt I "Configuring IPv4 network interface $iface in static mode..."
@@ -49,7 +49,7 @@ conf_network()
if [[ -n $(eval echo \$NET4_NS_SEARCH_$iface) ]]; then if [[ -n $(eval echo \$NET4_NS_SEARCH_$iface) ]]; then
echo -e "\tdns_search $(eval echo \$NET4_NS_SEARCH_$iface)" >> $if_file echo -e "\tdns_search $(eval echo \$NET4_NS_SEARCH_$iface)" >> $if_file
fi fi
elif [[ $(eval echo \$NET4_MODE_$iface) == dhcp ]] elif [[ $(eval echo \$NET4_MODE_$iface) == dhcp ]]; then
prnt I "Configuring IPv4 network interface $iface in DHCP mode..." prnt I "Configuring IPv4 network interface $iface in DHCP mode..."
echo "auto $iface" >> $if_file echo "auto $iface" >> $if_file
echo "iface $iface inet dhcp" >> $if_file echo "iface $iface inet dhcp" >> $if_file
@@ -60,7 +60,7 @@ conf_network()
fi fi
done done
for iface in $IPV6_IFACES; then for iface in $IPV6_IFACES; do
echo -e "\n# --------------------------------\n" >> $if_file echo -e "\n# --------------------------------\n" >> $if_file
if [[ $(eval echo \$NET6_MODE_$iface) == manual ]]; then if [[ $(eval echo \$NET6_MODE_$iface) == manual ]]; then
prnt I "Configuring IPv6 network interface $iface in static mode..." prnt I "Configuring IPv6 network interface $iface in static mode..."
@@ -76,11 +76,10 @@ conf_network()
if [[ -n $(eval echo \$NET6_NS_SEARCH_$iface) ]]; then if [[ -n $(eval echo \$NET6_NS_SEARCH_$iface) ]]; then
echo -e "\tdns_search $(eval echo \$NET6_NS_SEARCH_$iface)" >> $if_file echo -e "\tdns_search $(eval echo \$NET6_NS_SEARCH_$iface)" >> $if_file
fi fi
elif [[ $(eval echo \$NET6_MODE_$iface) == dhcp ]] elif [[ $(eval echo \$NET6_MODE_$iface) == dhcp ]]; then
prnt I "Configuring IPv6 network interface $iface in DHCP mode..." prnt I "Configuring IPv6 network interface $iface in DHCP mode..."
echo "auto $iface" >> $if_file echo "auto $iface" >> $if_file
echo "iface $iface inet6 dhcp" >> $if_file echo "iface $iface inet6 dhcp" >> $if_file
fi
elif [[ $(eval echo \$NET6_MODE_$iface) == manual ]]; then elif [[ $(eval echo \$NET6_MODE_$iface) == manual ]]; then
local fname=$(eval echo \$NET6_MANUAL_FILE_$iface) local fname=$(eval echo \$NET6_MANUAL_FILE_$iface)
appendfile $fname $if_file appendfile $fname $if_file