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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kristopher Ruzic
slapos.package
Commits
32de5cf4
Commit
32de5cf4
authored
May 06, 2013
by
Jondy Zhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
No convert ipv4 netmask in ip addr command
parent
c8b6d07b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
3 deletions
+6
-3
windows/scripts/ip
windows/scripts/ip
+4
-1
windows/scripts/slapos-all-in-one.iss
windows/scripts/slapos-all-in-one.iss
+1
-1
windows/scripts/slapos.iss
windows/scripts/slapos.iss
+1
-1
No files found.
windows/scripts/ip
View file @
32de5cf4
...
@@ -541,7 +541,7 @@ if [[ $object == "link" ]] ; then
...
@@ -541,7 +541,7 @@ if [[ $object == "link" ]] ; then
elif
[[
$object
==
"addr"
]]
;
then
elif
[[
$object
==
"addr"
]]
;
then
if
[[
$command
==
"add"
]]
||
[[
$command
==
"del"
]]
;
then
if
[[
$command
==
"add"
]]
||
[[
$command
==
"del"
]]
;
then
mask
=
$(
prefix_to_netmask
$(
basename
$1
)
)
mask
=
$(
basename
$1
)
address
=
$(
dirname
$1
)
address
=
$(
dirname
$1
)
if
[[
"
$opt_family
"
==
""
]]
;
then
if
[[
"
$opt_family
"
==
""
]]
;
then
if
[[
"
$address
"
==
*
:
*
]]
;
then
if
[[
"
$address
"
==
*
:
*
]]
;
then
...
@@ -562,6 +562,9 @@ elif [[ $object == "addr" ]] ; then
...
@@ -562,6 +562,9 @@ elif [[ $object == "addr" ]] ; then
if
[[
"
$opt_family
"
==
"ipv4"
||
"
$opt_family
"
==
""
]]
;
then
if
[[
"
$opt_family
"
==
"ipv4"
||
"
$opt_family
"
==
""
]]
;
then
ipcmd
=
"netsh interface ip
$command
address"
ipcmd
=
"netsh interface ip
$command
address"
if
[[
!
"
$mask
"
==
*
.
*
]]
;
then
mask
=
$(
prefix_to_netmask
$mask
)
fi
address
=
"
$address
$mask
"
address
=
"
$address
$mask
"
elif
[[
"
$opt_family
"
==
"ipv6"
]]
;
then
elif
[[
"
$opt_family
"
==
"ipv6"
]]
;
then
ipcmd
=
"netsh interface ipv6
$command
address"
ipcmd
=
"netsh interface ipv6
$command
address"
...
...
windows/scripts/slapos-all-in-one.iss
View file @
32de5cf4
...
@@ -79,7 +79,7 @@ Name: "{group}\Configure Node"; Filename: "{app}\cygwin\bin\bash.exe"; Parameter
...
@@ -79,7 +79,7 @@ Name: "{group}\Configure Node"; Filename: "{app}\cygwin\bin\bash.exe"; Parameter
Name: "{group}\Command Console"; Filename: "{app}\cygwin\bin\bash.exe"; Parameters: "--login -i /opt/slapos/bin/slapconsole /etc/opt/slapos/slapos.cfg"; WorkingDir: "{app}\cygwin\etc\slapos\scripts"; IconFilename: "{app}\cygwin\etc\slapos\images\terminal.ico";
Name: "{group}\Command Console"; Filename: "{app}\cygwin\bin\bash.exe"; Parameters: "--login -i /opt/slapos/bin/slapconsole /etc/opt/slapos/slapos.cfg"; WorkingDir: "{app}\cygwin\etc\slapos\scripts"; IconFilename: "{app}\cygwin\etc\slapos\images\terminal.ico";
Name: "{group}\Update Center"; Filename: "{app}\cygwin\bin\bash.exe"; Parameters: "--login -i /etc/slapos/scripts/build-slapos.sh"; WorkingDir: "{app}\cygwin\etc\slapos\scripts"; IconFilename: "{app}\cygwin\etc\slapos\images\updater.ico";
Name: "{group}\Update Center"; Filename: "{app}\cygwin\bin\bash.exe"; Parameters: "--login -i /etc/slapos/scripts/build-slapos.sh"; WorkingDir: "{app}\cygwin\etc\slapos\scripts"; IconFilename: "{app}\cygwin\etc\slapos\images\updater.ico";
Name: "{group}\User Guide"; Filename: "{app}\user-guide.html";
Name: "{group}\User Guide"; Filename: "{app}\user-guide.html";
Name: "{group}\Read Me"; Filename: "{app}\
r
eadme.txt";
Name: "{group}\Read Me"; Filename: "{app}\
R
eadme.txt";
Name: "{group}\SlapOS.org"; Filename: "http://www.slapos.org/";
Name: "{group}\SlapOS.org"; Filename: "http://www.slapos.org/";
Name: "{group}\Uninstall SlapOS"; Filename: "{uninstallexe}";
Name: "{group}\Uninstall SlapOS"; Filename: "{uninstallexe}";
...
...
windows/scripts/slapos.iss
View file @
32de5cf4
...
@@ -72,7 +72,7 @@ Name: "{group}\Configure Node"; Filename: "{app}\cygwin\bin\bash.exe"; Parameter
...
@@ -72,7 +72,7 @@ Name: "{group}\Configure Node"; Filename: "{app}\cygwin\bin\bash.exe"; Parameter
Name: "{group}\Command Console"; Filename: "{app}\cygwin\bin\bash.exe"; Parameters: "--login -i /opt/slapos/bin/slapconsole /etc/opt/slapos/slapos.cfg"; WorkingDir: "{app}\cygwin\etc\slapos\scripts"; IconFilename: "{app}\cygwin\etc\slapos\images\terminal.ico";
Name: "{group}\Command Console"; Filename: "{app}\cygwin\bin\bash.exe"; Parameters: "--login -i /opt/slapos/bin/slapconsole /etc/opt/slapos/slapos.cfg"; WorkingDir: "{app}\cygwin\etc\slapos\scripts"; IconFilename: "{app}\cygwin\etc\slapos\images\terminal.ico";
Name: "{group}\Update Center"; Filename: "{app}\cygwin\bin\bash.exe"; Parameters: "--login -i /etc/slapos/scripts/build-slapos.sh"; WorkingDir: "{app}\cygwin\etc\slapos\scripts"; IconFilename: "{app}\cygwin\etc\slapos\images\updater.ico";
Name: "{group}\Update Center"; Filename: "{app}\cygwin\bin\bash.exe"; Parameters: "--login -i /etc/slapos/scripts/build-slapos.sh"; WorkingDir: "{app}\cygwin\etc\slapos\scripts"; IconFilename: "{app}\cygwin\etc\slapos\images\updater.ico";
Name: "{group}\User Guide"; Filename: "{app}\user-guide.html";
Name: "{group}\User Guide"; Filename: "{app}\user-guide.html";
Name: "{group}\Read Me"; Filename: "{app}\
r
eadme.txt";
Name: "{group}\Read Me"; Filename: "{app}\
R
eadme.txt";
Name: "{group}\SlapOS.org"; Filename: "http://www.slapos.org/";
Name: "{group}\SlapOS.org"; Filename: "http://www.slapos.org/";
Name: "{group}\Uninstall SlapOS"; Filename: "{uninstallexe}";
Name: "{group}\Uninstall SlapOS"; Filename: "{uninstallexe}";
...
...
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