Commit caa1db23 authored by Jondy Zhao's avatar Jondy Zhao

slapos-configure: fix ipv4_local_network is not expected

parent 913ffe90
...@@ -326,7 +326,7 @@ function install_tap_driver() ...@@ -326,7 +326,7 @@ function install_tap_driver()
# check if ifname has been installed # check if ifname has been installed
if [[ ! "$1" == "" ]] ; then if [[ ! "$1" == "" ]] ; then
if netsh interface ipv6 show interface | grep -q "\\b$1\\b" ; then if netsh interface ipv6 show interface | grep -q "\\b$1\$" ; then
echo "Nothing need to do, \"$1\" has been installed." echo "Nothing need to do, \"$1\" has been installed."
return 0 return 0
fi fi
......
...@@ -745,7 +745,7 @@ while test $# -gt 0; do ...@@ -745,7 +745,7 @@ while test $# -gt 0; do
done done
if [[ -z "${_ipv4_local_network}" ]] ; then if [[ -z "${_ipv4_local_network}" ]] ; then
_ipv4_local_network=$(get_free_local_ipv4_network) || _ipv4_local_network=$(get_free_local_ipv4_network).0/24 ||
csih_error "no ipv4_local_network specified" csih_error "no ipv4_local_network specified"
fi fi
......
...@@ -204,7 +204,7 @@ function get_free_local_ipv4_network() ...@@ -204,7 +204,7 @@ function get_free_local_ipv4_network()
addr=${seg1}.${seg2} addr=${seg1}.${seg2}
! IPCONFIG /ALL | grep -q ${addr} && ! IPCONFIG /ALL | grep -q ${addr} &&
echo ${addr} && echo 10.${addr} &&
return 0 return 0
let i-- let i--
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment