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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Xiaowu Zhang
slapos.package
Commits
4c1a779d
Commit
4c1a779d
authored
Jul 02, 2013
by
Jondy Zhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove the commands used to start re6stnet on configure slapos node.
parent
14235704
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
31 deletions
+1
-31
windows/scripts/slapos-configure.sh
windows/scripts/slapos-configure.sh
+0
-30
windows/scripts/slapos-node.sh
windows/scripts/slapos-node.sh
+1
-1
No files found.
windows/scripts/slapos-configure.sh
View file @
4c1a779d
...
...
@@ -602,36 +602,6 @@ regtool -q get "$slapos_run_key\\$slapos_run_entry" || \
echo
Startup item
"
$slapos_run_key
\\
$slapos_run_entry
"
:
$(
regtool get
"
$slapos_run_key
\\
$slapos_run_entry
"
)
echo
#-------------------------------------------------
# IPv6 Connection
#-------------------------------------------------
echo
"Checking native IPv6 ..."
check_ipv6_connection
# Run re6stnet if no native ipv6
if
((
$?
))
;
then
echo
"No native IPv6."
echo
Check re6stnet network ...
which re6stnet
>
/dev/null 2>&1
||
show_error_exit
"Error: no re6stnet installed."
# re6st-conf --registry http://re6stnet.nexedi.com/ --is-needed
# Check if babeld is running, so we guess whether re6stnet is running or not
ps
-ef
|
grep
-q
/usr/local/bin/babeld
if
((
$?
))
;
then
echo
"Start re6stnet ..."
# It need root rights to install tap-driver
cd
/etc/re6stnet
[[
-d
/var/log/re6stnet
]]
||
mkdir
-p
/var/log/re6stnet
re6stnet @re6stnet.conf
--ovpnlog
-I
$slapos_ifname
-i
$slapos_ifname
>>
/var/log/re6stnet/slapos-node.log 2>&1 &
echo
$!
>
/var/run/slapos-node-re6stnet.pid
disown
-h
echo
"Start re6stent (pid=
$!
) in the background OK."
echo
"You can check log files in the /var/log/re6stnet/."
echo
fi
echo
"re6stnet network OK."
else
echo
"Native IPv6 Found."
fi
echo
SlapOS Node configure successfully.
read
-n
1
-t
60
-p
"Press any key to exit..."
exit
0
windows/scripts/slapos-node.sh
View file @
4c1a779d
...
...
@@ -75,8 +75,8 @@ if (( $? )) ; then
cd
/etc/re6stnet
[[
-d
/var/log/re6stnet
]]
||
mkdir
-p
/var/log/re6stnet
re6stnet @re6stnet.conf
--ovpnlog
-I
$slapos_ifname
-i
$slapos_ifname
>>
/var/log/re6stnet/slapos-node.log 2>&1 &
echo
$!
>
/var/run/slapos-node-re6stnet.pid
disown
-h
echo
$!
>
/var/run/slapos-node-re6stnet.pid
echo
"Start re6stent (pid=
$!
) in the background OK."
echo
"You can check log files in the /var/log/re6stnet/."
echo
...
...
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