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
Ivan Tyagov
slapos.package
Commits
0ef1c381
Commit
0ef1c381
authored
May 28, 2013
by
Jondy Zhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove timeout when configure node is over.
The init-slapos-node.bat isn't generated.
parent
324b9072
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
windows/scripts/init-slapos-node.sh
windows/scripts/init-slapos-node.sh
+1
-1
windows/scripts/post-install.sh
windows/scripts/post-install.sh
+2
-2
windows/scripts/slapos-client-config.sh
windows/scripts/slapos-client-config.sh
+1
-1
windows/scripts/slapos-node-config.sh
windows/scripts/slapos-node-config.sh
+2
-2
No files found.
windows/scripts/init-slapos-node.sh
View file @
0ef1c381
...
@@ -27,7 +27,7 @@ echo "Start re6stent (pid:$!)in the background OK."
...
@@ -27,7 +27,7 @@ echo "Start re6stent (pid:$!)in the background OK."
# Run slapformat
# Run slapformat
echo
"Initializing SlapOS Node ..."
echo
"Initializing SlapOS Node ..."
/
bin/bash
--login
-i
/
opt/slapos/bin/slapos node format
-c
--now
/opt/slapos/bin/slapos node format
-c
--now
if
((
$?
))
;
then
if
((
$?
))
;
then
echo
"Initialize SlapOS Node failed."
echo
"Initialize SlapOS Node failed."
else
else
...
...
windows/scripts/post-install.sh
View file @
0ef1c381
...
@@ -25,11 +25,11 @@ else
...
@@ -25,11 +25,11 @@ else
cp
/etc/passwd /etc/passwd.orig
cp
/etc/passwd /etc/passwd.orig
fi
fi
sed
-i
-e
"s/Administrator:unused:500:/Administrator:unused:0:/g"
/etc/passwd
#
sed -i -e "s/Administrator:unused:500:/Administrator:unused:0:/g" /etc/passwd
grep
-q
"^root:"
/etc/passwd
grep
-q
"^root:"
/etc/passwd
if
((
$?
!=
0
))
;
then
if
((
$?
!=
0
))
;
then
myaccount
=
$(
grep
"^Administrator:"
/etc/passwd |
\
myaccount
=
$(
grep
"^Administrator:"
/etc/passwd |
\
sed
-e
"s/Administrator:
/root
:/g"
)
sed
-e
"s/Administrator:
unused:500:/root:unused:0
:/g"
)
if
[[
"
${
myaccount
:0:4
}
"
==
root
]]
;
then
if
[[
"
${
myaccount
:0:4
}
"
==
root
]]
;
then
echo
$myaccount
>>
/etc/passwd
echo
$myaccount
>>
/etc/passwd
else
else
...
...
windows/scripts/slapos-client-config.sh
View file @
0ef1c381
...
@@ -74,5 +74,5 @@ sed -i -e "s%^cert_file.*$%cert_file = $client_certificate_file%" \
...
@@ -74,5 +74,5 @@ sed -i -e "s%^cert_file.*$%cert_file = $client_certificate_file%" \
$client_configure_file
$client_configure_file
echo
SlapOS Client configure successfully.
echo
SlapOS Client configure successfully.
read
-n
1
-
t
10
-
p
"Press any key to exit..."
read
-n
1
-p
"Press any key to exit..."
exit
0
exit
0
windows/scripts/slapos-node-config.sh
View file @
0ef1c381
...
@@ -264,7 +264,7 @@ password_file=/etc/passwd
...
@@ -264,7 +264,7 @@ password_file=/etc/passwd
password_orig
=
/etc/slapos-format-passwd.orig
password_orig
=
/etc/slapos-format-passwd.orig
cygroot
=
$(
cygpath
-w
-a
/
)
cygroot
=
$(
cygpath
-w
-a
/
)
echo
"Add
${
init_script
}
.sh as Windows startup item."
echo
"Add
${
init_script
}
.sh as Windows startup item."
[[
-f
${
init_script
}
.bat
]]
&&
cat
<<
EOF
>
${
init_script
}
.bat
[[
!
-f
${
init_script
}
.bat
]]
&&
cat
<<
EOF
>
${
init_script
}
.bat
@ECHO OFF
@ECHO OFF
SETLOCAL
SETLOCAL
...
@@ -288,5 +288,5 @@ regtool -q set "$run_key\\$slapos_run_entry" \
...
@@ -288,5 +288,5 @@ regtool -q set "$run_key\\$slapos_run_entry" \
show_error_exit
"Add startup item failed."
show_error_exit
"Add startup item failed."
echo
SlapOS Node configure successfully.
echo
SlapOS Node configure successfully.
read
-n
1
-
t
10
-
p
"Press any key to exit..."
read
-n
1
-p
"Press any key to exit..."
exit
0
exit
0
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