Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.package
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Douglas
slapos.package
Commits
caa1db23
Commit
caa1db23
authored
Sep 13, 2013
by
Jondy Zhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos-configure: fix ipv4_local_network is not expected
parent
913ffe90
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
windows/scripts/ip
windows/scripts/ip
+1
-1
windows/scripts/slapos-configure.sh
windows/scripts/slapos-configure.sh
+1
-1
windows/scripts/slapos-include.sh
windows/scripts/slapos-include.sh
+1
-1
No files found.
windows/scripts/ip
View file @
caa1db23
...
@@ -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
...
...
windows/scripts/slapos-configure.sh
View file @
caa1db23
...
@@ -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
...
...
windows/scripts/slapos-include.sh
View file @
caa1db23
...
@@ -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--
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment