diff options
Diffstat (limited to 'etc/rc.d')
| -rw-r--r-- | etc/rc.d/netoptions | 9 | ||||
| -rw-r--r-- | etc/rc.d/network1 | 9 | ||||
| -rw-r--r-- | etc/rc.d/network2 | 9 | ||||
| -rw-r--r-- | etc/rc.d/network3 | 9 | ||||
| -rw-r--r-- | etc/rc.d/routing | 9 |
5 files changed, 20 insertions, 25 deletions
diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions index a3ec576..303cd1f 100644 --- a/etc/rc.d/netoptions +++ b/etc/rc.d/netoptions @@ -344,14 +344,13 @@ network_pass1() { [Yy][Ee][Ss]) if [ -n "${natd_interface}" ]; then if echo ${natd_interface} | \ - grep -q -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$'; then - natd_ifarg="-a ${natd_interface}" + grep -q -E '^[0-9]+(\.[0-9]+){0,3}$'; then + natd_flags="$natd_flags -a ${natd_interface}" else - natd_ifarg="-n ${natd_interface}" + natd_flags="$natd_flags -n ${natd_interface}" fi - - echo -n ' natd'; ${natd_program:-/sbin/natd} ${natd_flags} ${natd_ifarg} fi + echo -n ' natd'; ${natd_program:-/sbin/natd} ${natd_flags} ;; esac diff --git a/etc/rc.d/network1 b/etc/rc.d/network1 index a3ec576..303cd1f 100644 --- a/etc/rc.d/network1 +++ b/etc/rc.d/network1 @@ -344,14 +344,13 @@ network_pass1() { [Yy][Ee][Ss]) if [ -n "${natd_interface}" ]; then if echo ${natd_interface} | \ - grep -q -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$'; then - natd_ifarg="-a ${natd_interface}" + grep -q -E '^[0-9]+(\.[0-9]+){0,3}$'; then + natd_flags="$natd_flags -a ${natd_interface}" else - natd_ifarg="-n ${natd_interface}" + natd_flags="$natd_flags -n ${natd_interface}" fi - - echo -n ' natd'; ${natd_program:-/sbin/natd} ${natd_flags} ${natd_ifarg} fi + echo -n ' natd'; ${natd_program:-/sbin/natd} ${natd_flags} ;; esac diff --git a/etc/rc.d/network2 b/etc/rc.d/network2 index a3ec576..303cd1f 100644 --- a/etc/rc.d/network2 +++ b/etc/rc.d/network2 @@ -344,14 +344,13 @@ network_pass1() { [Yy][Ee][Ss]) if [ -n "${natd_interface}" ]; then if echo ${natd_interface} | \ - grep -q -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$'; then - natd_ifarg="-a ${natd_interface}" + grep -q -E '^[0-9]+(\.[0-9]+){0,3}$'; then + natd_flags="$natd_flags -a ${natd_interface}" else - natd_ifarg="-n ${natd_interface}" + natd_flags="$natd_flags -n ${natd_interface}" fi - - echo -n ' natd'; ${natd_program:-/sbin/natd} ${natd_flags} ${natd_ifarg} fi + echo -n ' natd'; ${natd_program:-/sbin/natd} ${natd_flags} ;; esac diff --git a/etc/rc.d/network3 b/etc/rc.d/network3 index a3ec576..303cd1f 100644 --- a/etc/rc.d/network3 +++ b/etc/rc.d/network3 @@ -344,14 +344,13 @@ network_pass1() { [Yy][Ee][Ss]) if [ -n "${natd_interface}" ]; then if echo ${natd_interface} | \ - grep -q -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$'; then - natd_ifarg="-a ${natd_interface}" + grep -q -E '^[0-9]+(\.[0-9]+){0,3}$'; then + natd_flags="$natd_flags -a ${natd_interface}" else - natd_ifarg="-n ${natd_interface}" + natd_flags="$natd_flags -n ${natd_interface}" fi - - echo -n ' natd'; ${natd_program:-/sbin/natd} ${natd_flags} ${natd_ifarg} fi + echo -n ' natd'; ${natd_program:-/sbin/natd} ${natd_flags} ;; esac diff --git a/etc/rc.d/routing b/etc/rc.d/routing index a3ec576..303cd1f 100644 --- a/etc/rc.d/routing +++ b/etc/rc.d/routing @@ -344,14 +344,13 @@ network_pass1() { [Yy][Ee][Ss]) if [ -n "${natd_interface}" ]; then if echo ${natd_interface} | \ - grep -q -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$'; then - natd_ifarg="-a ${natd_interface}" + grep -q -E '^[0-9]+(\.[0-9]+){0,3}$'; then + natd_flags="$natd_flags -a ${natd_interface}" else - natd_ifarg="-n ${natd_interface}" + natd_flags="$natd_flags -n ${natd_interface}" fi - - echo -n ' natd'; ${natd_program:-/sbin/natd} ${natd_flags} ${natd_ifarg} fi + echo -n ' natd'; ${natd_program:-/sbin/natd} ${natd_flags} ;; esac |
