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

conf_network: fixes, cleanup and clarity

Browse Source
This commit is contained in:
levasseur
2022-01-07 18:56:26 +01:00
parent bac26fb8b9
commit 4b5a2870a6
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
modules/conf_network.sh
View File

@@ -20,39 +20,44 @@
# * NET{4,6}_MANUAL_FILE_$iface: filename for manual configuration of $iface # * NET{4,6}_MANUAL_FILE_$iface: filename for manual configuration of $iface
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
export VER_conf_syslog="0.0.3" export VER_conf_syslog="0.0.4"
conf_network() conf_network()
{ {
local if_file="/etc/network/interfaces" local if_file="/etc/network/interfaces"
backup_dist $if_file backupdist $if_file
# The interfaces header contain loopback interface declaration # The interfaces header contain loopback interface declaration
install_file interfaces.head $if_file installfile interfaces.head $if_file
tagfine $if_file tagfile $if_file
# First configure IPv4 ifaces # First configure IPv4 ifaces
local iface= local iface=
for iface in $IPV4_IFACES; do 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) == static ]]; then
prnt I "Configuring IPv4 network interface $iface in static mode..." prnt I "Configuring IPv4 network interface $iface in static mode..."
echo "auto $iface" >> $if_file echo "auto $iface" >> $if_file
echo "iface $iface inet static" >> $if_file echo "iface $iface inet static" >> $if_file
echo -e "\taddress $(eval echo \$NET4_IP_$iface)" >> $if_file echo -e "\taddress $(eval echo \$NET4_IP_$iface)" >> $if_file
if [[ -n $(eval echo \$NET4_GW_$iface) ]]; then if [[ -n $(eval echo \$NET4_GW_$iface) ]]; then
echo -e "\tgateway $(eval echo \$NET4_GW_$iface)" >> $if_file echo -e "\tgateway $(eval echo \$NET4_GW_$iface)" >> $if_file
fi fi
if [[ -n $(eval echo \$NET4_NS_$iface) ]]; then if [[ -n $(eval echo \$NET4_NS_$iface) ]]; then
echo -e "\tdns_nameservers $(eval echo \$NET4_NS_$iface)" >> $if_file echo -e "\tdns_nameservers $(eval echo \$NET4_NS_$iface)" >> $if_file
fi fi
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 ]]; then 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
elif [[ $(eval echo \$NET4_MODE_$iface) == manual ]]; then elif [[ $(eval echo \$NET4_MODE_$iface) == manual ]]; then
local fname=$(eval echo \$NET4_MANUAL_FILE_$iface) local fname=$(eval echo \$NET4_MANUAL_FILE_$iface)
appendfile $fname $if_file appendfile $fname $if_file
@@ -62,24 +67,29 @@ conf_network()
for iface in $IPV6_IFACES; do 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) == static ]]; then
prnt I "Configuring IPv6 network interface $iface in static mode..." prnt I "Configuring IPv6 network interface $iface in static mode..."
echo "auto $iface" >> $if_file echo "auto $iface" >> $if_file
echo "iface $iface inet6 static" >> $if_file echo "iface $iface inet6 static" >> $if_file
echo -e "\taddress $(eval echo \$NET6_IP_$iface)" >> $if_file echo -e "\taddress $(eval echo \$NET6_IP_$iface)" >> $if_file
if [[ -n $(eval echo \$NET6_GW_$iface) ]]; then if [[ -n $(eval echo \$NET6_GW_$iface) ]]; then
echo -e "\tgateway $(eval echo \$NET6_GW_$iface)" >> $if_file echo -e "\tgateway $(eval echo \$NET6_GW_$iface)" >> $if_file
fi fi
if [[ -n $(eval echo \$NET6_NS_$iface) ]]; then if [[ -n $(eval echo \$NET6_NS_$iface) ]]; then
echo -e "\tdns_nameservers $(eval echo \$NET6_NS_$iface)" >> $if_file echo -e "\tdns_nameservers $(eval echo \$NET6_NS_$iface)" >> $if_file
fi fi
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 ]]; then 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
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