diff --git a/windows/scripts/init-slapos-node.sh b/windows/scripts/init-slapos-node.sh index 9409e0a8df5c67f40401ee04eb6f5328ff7af54f..4206bc9a8c2b0aa40d57a934c90065cc13d4622e 100755 --- a/windows/scripts/init-slapos-node.sh +++ b/windows/scripts/init-slapos-node.sh @@ -27,7 +27,7 @@ echo "Start re6stent (pid:$!)in the background OK." # Run slapformat 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 echo "Initialize SlapOS Node failed." else diff --git a/windows/scripts/post-install.sh b/windows/scripts/post-install.sh index 218ab821549f946e61f9a13c5f64c562e782462a..131677e168acaface67d9b364986cd012bbb79f4 100755 --- a/windows/scripts/post-install.sh +++ b/windows/scripts/post-install.sh @@ -25,11 +25,11 @@ else cp /etc/passwd /etc/passwd.orig 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 if (( $? != 0 )) ; then 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 echo $myaccount >> /etc/passwd else diff --git a/windows/scripts/slapos-client-config.sh b/windows/scripts/slapos-client-config.sh index 4afeefcc890db69465526883d220573b24bee8d7..896988c46afe6526441e1ea939e39d0418f0f74a 100755 --- a/windows/scripts/slapos-client-config.sh +++ b/windows/scripts/slapos-client-config.sh @@ -74,5 +74,5 @@ sed -i -e "s%^cert_file.*$%cert_file = $client_certificate_file%" \ $client_configure_file 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 diff --git a/windows/scripts/slapos-node-config.sh b/windows/scripts/slapos-node-config.sh index d582379c571f037c2c704f8022a494af78799146..c5cc46d1110d35481aeb4c984c5151abfe0c4ce4 100755 --- a/windows/scripts/slapos-node-config.sh +++ b/windows/scripts/slapos-node-config.sh @@ -264,7 +264,7 @@ password_file=/etc/passwd password_orig=/etc/slapos-format-passwd.orig cygroot=$(cygpath -w -a /) 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 SETLOCAL @@ -288,5 +288,5 @@ regtool -q set "$run_key\\$slapos_run_entry" \ show_error_exit "Add startup item failed." 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