Commit 4ada13a3 authored by Jondy Zhao's avatar Jondy Zhao

Fix rebase couldn't find myfile.list;

Fix re6stnet service couldn't start
parent ff0b857d
...@@ -93,8 +93,8 @@ echo Checking ${_filename} ... ...@@ -93,8 +93,8 @@ echo Checking ${_filename} ...
if [[ ! -f ${_filename} ]] ; then if [[ ! -f ${_filename} ]] ; then
cat <<EOF > ${_filename} cat <<EOF > ${_filename}
@echo off @echo off
${cyghome}\bin\find /opt/slapos -name "*.dll" > /myfile.list ${cyghome}\bin\find /opt/slapos -name "*.dll" > ${cyghome}\myfile.list
IF EXIST ${cyghome}\opt\slapgrid. ${cyghome}\bin\find /opt/slapgrid -name "*.dll" >> /myfile.list IF EXIST ${cyghome}\opt\slapgrid. ${cyghome}\bin\find /opt/slapgrid -name "*.dll" >> ${cyghome}\myfile.list
TASKKILL /F /IM openvpn.exe TASKKILL /F /IM openvpn.exe
NET STOP re6stnet NET STOP re6stnet
NET STOP cygserver NET STOP cygserver
......
...@@ -421,10 +421,16 @@ if check_re6stnet_needed ; then ...@@ -421,10 +421,16 @@ if check_re6stnet_needed ; then
csih_error "Failed to install $re6stnet_service_name service." csih_error "Failed to install $re6stnet_service_name service."
fi fi
echo "You can check log files in the /var/log/re6stnet/*.log" echo "You can check log files in the /var/log/re6stnet/*.log"
check_cygwin_service $re6stnet_service_name || if ! check_cygwin_service $re6stnet_service_name ; then
csih_error_multi "Failed to start $re6stnet_service_name service. " \ csih_error_multi "Failed to start $re6stnet_service_name service. " \
"Sometimes it's occurred when shutdown service re6stnet in unusual ways, " \ "One possible case is that re6stnet service is shutdown in unusual ways, " \
"Try run 'rm -rf /var/lib/re6stnet' then re-configure again." "and in this case, you can fix it by removing '/var/lib/re6stnet'."
if csih_request "Do you want to let me remove '/var/lib/re6stnet' for you?" ; then
rm -rf /var/lib/re6stnet
check_cygwin_service $re6stnet_service_name ||
csih_error "Failed to start $re6stnet_service_name service."
fi
fi
else else
echo "Native IPv6 found, no taps required." echo "Native IPv6 found, no taps required."
fi fi
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment