From e46899fcdb97946ac617f4921a0100f670ab3444 Mon Sep 17 00:00:00 2001 From: Luigi Rizzo Date: Sun, 7 Oct 2001 17:17:26 +0000 Subject: [PATCH] Make fetch_mask return ${default_mask} if entry not found. Add a couple of diagnostic messages. --- release/picobsd/floppy.tree/etc/rc.conf | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/release/picobsd/floppy.tree/etc/rc.conf b/release/picobsd/floppy.tree/etc/rc.conf index 67477bd22f40..33a9dda598df 100644 --- a/release/picobsd/floppy.tree/etc/rc.conf +++ b/release/picobsd/floppy.tree/etc/rc.conf @@ -74,6 +74,7 @@ fetch_hostname() { esac fi done < /etc/hosts + echo "fetch_hostname for <${key}> returns <${hostname}>" } # sets "mask" using $1 (netmask name) as the search key in /etc/networks @@ -89,6 +90,10 @@ fetch_mask() { ;; esac done < /etc/networks + if [ "${mask}" = "" ] ; then + mask=${default_mask} + fi + echo "fetch_mask for <${key}> returns <${mask}>" } @@ -104,9 +109,6 @@ set_main_interface() { fi fi fetch_mask ${hostname}-netmask - if [ "${mask}" = "" ] ; then - mask=${default_mask} - fi eval ifconfig_${main_if}=\" \${hostname} netmask \${mask}\" network_interfaces=`ifconfig -l`