gh-131: FreeBSD IPv6 and NIC aliases, minor fixes

pull/140/head
Vlastimil Holer 6 years ago
parent fcf3212db2
commit 3ccc0f57c4
No known key found for this signature in database
GPG Key ID: EB549BADEFD07C53

@ -99,57 +99,65 @@ get_iface_var() {
} }
gen_iface_conf() { gen_iface_conf() {
cat <<EOT echo -n "ifconfig_${DEV}=\"inet ${IP} netmask ${MASK}"
ifconfig_$DEV="inet $IP netmask $MASK"
EOT
if [ -n "$MTU" ]; then if [ -n "${MTU}" ]; then
echo "ifconfig_$DEV=\"inet $IP netmask $MASK mtu $MTU\"" echo -n " mtu ${MTU}"
else
echo "ifconfig_$DEV=\"inet $IP netmask $MASK\""
fi fi
echo "\""
if [ -n "$GATEWAY" ]; then ###
echo "defaultrouter=\"$GATEWAY\"" > /etc/rc.conf.d/routing
fi
if [ -n "${GATEWAY}" ]; then
echo "defaultrouter=\"${GATEWAY}\"" >> /etc/rc.conf.d/routing
fi
} }
gen_iface6_conf() { gen_alias_conf() {
if [ "$CONFIG_PATH" = "/etc/sysconfig/network" ]; then echo "ifconfig_${DEV}_alias${ALIAS_NUM}=\"inet ${IP} netmask ${MASK}\""
echo "IPADDR_0=$IP6/${IP6_PREFIX_LENGTH:-64}" ALIAS_NUM=$((ALIAS_NUM + 1))
}
cat <<EOT >> /etc/sysconfig/network/ifsysctl-$DEV gen_alias6_conf() {
net.ipv6.conf.\$SYSCTL_IF.autoconf = 0 # very first IPv6 can't be alias
net.ipv6.conf.\$SYSCTL_IF.accept_ra = 0 if [ -n "${HAS_IP6}" ]; then
EOT echo "ifconfig_${DEV}_alias${ALIAS_NUM}=\"inet6 ${IP6} prefixlen ${IP6_PREFIX_LENGTH:-64}\""
ALIAS_NUM=$((ALIAS_NUM + 1))
else else
cat <<EOT echo -n "ifconfig_${DEV}_ipv6=\"inet6 ${IP6} prefixlen ${IP6_PREFIX_LENGTH:-64}"
IPV6INIT=yes
IPV6ADDR=$IP6/${IP6_PREFIX_LENGTH:-64} if [ -n "${MTU}" ]; then
IPV6_AUTOCONF=no echo -n " mtu ${MTU}"
EOT
fi fi
if [ -n "$IP6_ULA" ]; then echo " -accept_rtadv\""
if [ "$CONFIG_PATH" = "/etc/sysconfig/network" ]; then
echo "IPADDR_1=$IP6_ULA/64"
else
echo "IPV6ADDR_SECONDARIES=$IP6_ULA/64"
fi fi
if [ -n "${IP6_ULA}" ]; then
echo "ifconfig_${DEV}_alias${ALIAS_NUM}=\"inet6 ${IP6_ULA} prefixlen 64\""
ALIAS_NUM=$((ALIAS_NUM + 1))
fi fi
}
if [ -n "$GATEWAY6" ]; then gen_iface6_conf() {
if [ "$CONFIG_PATH" = "/etc/sysconfig/network" ]; then echo -n "ifconfig_${DEV}_ipv6=\"inet6 ${IP6} prefixlen ${IP6_PREFIX_LENGTH:-64}"
echo "default $GATEWAY6 - $DEV" >> /etc/sysconfig/network/ifroute-$DEV
else if [ -n "${MTU}" ]; then
echo "IPV6_DEFAULTGW=$GATEWAY6" echo -n " mtu ${MTU}"
fi fi
echo " -accept_rtadv\""
if [ -n "${IP6_ULA}" ]; then
echo "ifconfig_${DEV}_alias${ALIAS_NUM}=\"inet6 ${IP6_ULA} prefixlen 64\""
ALIAS_NUM=$((ALIAS_NUM + 1))
fi fi
if [ -n "$MTU" ]; then ###
echo "IPV6_MTU=$MTU"
if [ -n "${GATEWAY6}" ]; then
echo "ipv6_defaultrouter=\"${GATEWAY6}\"" >> /etc/rc.conf.d/routing
fi fi
} }
@ -170,6 +178,11 @@ get_context_interfaces()
env | grep -E "^ETH[0-9]+_MAC=" | sed 's/_.*$//' | sort env | grep -E "^ETH[0-9]+_MAC=" | sed 's/_.*$//' | sort
} }
get_interface_alias()
{
env | grep -E "^ETH${INDEX}_ALIAS[0-9]+_MAC=" | cut -d '_' -f 2 | sort
}
get_dev() get_dev()
{ {
list="$1" list="$1"
@ -180,11 +193,8 @@ get_dev()
gen_network_configuration() gen_network_configuration()
{ {
if [ -d /etc/rc.conf.d ]; then # clean routing information
CONFIG_PATH=/etc/rc.conf.d echo -n > /etc/rc.conf.d/routing
fi
echo > /etc/rc.conf.d/network
INTERFACE_MAC=$(get_interface_mac) INTERFACE_MAC=$(get_interface_mac)
CONTEXT_INTERFACES=$(get_context_interfaces) CONTEXT_INTERFACES=$(get_context_interfaces)
@ -211,45 +221,49 @@ gen_network_configuration()
[ -z "${IP}${IP6}" ] && continue [ -z "${IP}${IP6}" ] && continue
[ -z "${DEV}" ] && continue [ -z "${DEV}" ] && continue
INDEX=${interface: -1}
ALIAS=$(get_interface_alias)
ALIAS_NUM=0
HAS_IP6=${IP6}
( [ -n "${IP}" ] && gen_iface_conf
[[ -n $IP ]] && gen_iface_conf [ -n "${IP6}" ] && gen_iface6_conf
#[[ -n $IP6 ]] && gen_iface6_conf
for nic_alias in $ALIAS; do
UPCASE_DEV="ETH${INDEX}_${nic_alias}"
IP=$(get_ip)
MASK=$(get_mask)
) >> ${CONFIG_PATH}/network IP6=$(get_iface_var "IP6")
[[ -z $IP6 ]] && IP6=$(get_iface_var "IPV6")
IP6_PREFIX_LENGTH=$(get_iface_var "IP6_PREFIX_LENGTH")
IP6_ULA=$(get_iface_var "IP6_ULA")
# ( EXTERNAL=$(get_iface_var "EXTERNAL")
# rm -f /etc/sysconfig/network/ifroute-$DEV EXTERNAL=${EXTERNAL^^}
# rm -f /etc/sysconfig/network/ifsysctl-$DEV
#
# cat <<EOT
#DEVICE=$DEV
#BOOTPROTO=static
#NM_CONTROLLED=no
#TYPE=Ethernet
#EOT
# ) >> ${CONFIG_PATH}/ifcfg-${DEV}
service netif restart if [ -z "${EXTERNAL}" ] || [ "$EXTERNAL" = "NO" ]; then
service routing restart [ -n "${IP}" ] && gen_alias_conf
if [ -n "${IP6}" ]; then
gen_alias6_conf
HAS_IP6=${IP6}
fi
fi
done
done done
} }
configure_network() configure_network()
{ {
gen_network_configuration gen_network_configuration >/etc/rc.conf.d/network
if [ "${COMMAND}" = 'reconfigure' ]; then if [ "${COMMAND}" = 'reconfigure' ]; then
service network restart service netif restart >/dev/null
service routing restart >/dev/null
fi fi
sleep 2
} }
[ -z "$(env | cut -d= -f1 | grep -E '^ETH[0-9]+_IPV*6*')" ] && exit 0 [ -z "$(env | cut -d= -f1 | grep -E '^ETH[0-9]+_IPV*6*')" ] && exit 0
configure_network configure_network

@ -33,6 +33,9 @@ rcvar="${name}_enable"
command="/usr/sbin/one-context-run" command="/usr/sbin/one-context-run"
command_args="force" command_args="force"
# run without any delay
export TIMEOUT=0
load_rc_config $name load_rc_config $name
: ${one_context_force_enable:="no"} : ${one_context_force_enable:="no"}
run_rc_command "$1" run_rc_command "$1"

@ -17,7 +17,7 @@
#--------------------------------------------------------------------------- # #--------------------------------------------------------------------------- #
# Set PATH # Set PATH
export PATH=/sbin:/bin:/usr/sbin:/usr/bin export PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin
TIMEOUT=${TIMEOUT:-60} TIMEOUT=${TIMEOUT:-60}
COMMAND=${1:-reconfigure} COMMAND=${1:-reconfigure}

Loading…
Cancel
Save