Never mix spaces and hard tabs

parent 0c627968
...@@ -10,8 +10,8 @@ ${ONLY_SLAPFORMAT:=false} ...@@ -10,8 +10,8 @@ ${ONLY_SLAPFORMAT:=false}
if [ $ONLY_SLAPFORMAT = false ]; then if [ $ONLY_SLAPFORMAT = false ]; then
if [ ! -f $SLAPOS_CONFIGURATION/slapos.cfg ]; then if [ ! -f $SLAPOS_CONFIGURATION/slapos.cfg ]; then
echo "No slapos.cfg found" echo "No slapos.cfg found"
exit 0 exit 0
fi fi
echo "Starting slap script" echo "Starting slap script"
...@@ -19,17 +19,17 @@ if [ $ONLY_SLAPFORMAT = false ]; then ...@@ -19,17 +19,17 @@ if [ $ONLY_SLAPFORMAT = false ]; then
# Check ipv4 # Check ipv4
ping -c 2 $IPV4CHECK ping -c 2 $IPV4CHECK
while [ $? != 0 ]; do while [ $? != 0 ]; do
sleep $(($i * 5)) sleep $(($i * 5))
if [[ $i < 40 ]]; then if [[ $i < 40 ]]; then
let i++ let i++
fi fi
ping -c 2 $IPV4CHECK ping -c 2 $IPV4CHECK
done done
# Launch openvpn # Launch openvpn
if [ -f $SLAPOS_CONFIGURATION/openvpn-needed ]; then if [ -f $SLAPOS_CONFIGURATION/openvpn-needed ]; then
/etc/init.d/openvpn start /etc/init.d/openvpn start
sleep 10 sleep 10
fi fi
# Wait for ipv6 connection to be ready # Wait for ipv6 connection to be ready
...@@ -37,11 +37,11 @@ if [ $ONLY_SLAPFORMAT = false ]; then ...@@ -37,11 +37,11 @@ if [ $ONLY_SLAPFORMAT = false ]; then
ping6 -c 2 $IPV6CHECK ping6 -c 2 $IPV6CHECK
while [ $? != 0 ]; while [ $? != 0 ];
do do
sleep $(($i * 10)) sleep $(($i * 10))
if [[ $i < 40 ]]; then if [[ $i < 40 ]]; then
let i++ let i++
fi fi
ping6 -c 2 $IPV6CHECK ping6 -c 2 $IPV6CHECK
done done
else else
sleep 15 sleep 15
...@@ -54,7 +54,7 @@ echo -n "Running slapformat..." ...@@ -54,7 +54,7 @@ echo -n "Running slapformat..."
while [ $? != 0 ]; do while [ $? != 0 ]; do
sleep $(($i*60)) sleep $(($i*60))
if [ $i < 20 ]; then if [ $i < 20 ]; then
let i++ let i++
fi fi
echo "Retrying slapformat" echo "Retrying slapformat"
/opt/slapos/bin/slapformat --now --console --verbose --verbose --log_file=/opt/slapos/slapformat.log $SLAPOS_CONFIGURATION/slapos.cfg /opt/slapos/bin/slapformat --now --console --verbose --verbose --log_file=/opt/slapos/slapformat.log $SLAPOS_CONFIGURATION/slapos.cfg
...@@ -66,12 +66,12 @@ if [ $ONLY_SLAPFORMAT = false ]; then ...@@ -66,12 +66,12 @@ if [ $ONLY_SLAPFORMAT = false ]; then
echo -n "Banging..." echo -n "Banging..."
/opt/slapos/bin/bang -m "Rebooted" $SLAPOS_CONFIGURATION/slapos.cfg /opt/slapos/bin/bang -m "Rebooted" $SLAPOS_CONFIGURATION/slapos.cfg
while [ $? != 0 ]; do while [ $? != 0 ]; do
sleep $(($i*60)) sleep $(($i*60))
if [ $i < 20 ]; then if [ $i < 20 ]; then
let i++ let i++
fi fi
echo "Retrying Bang" echo "Retrying Bang"
/opt/slapos/bin/bang -m "Rebooted" $SLAPOS_CONFIGURATION/slapos.cfg /opt/slapos/bin/bang -m "Rebooted" $SLAPOS_CONFIGURATION/slapos.cfg
done done
echo "done." echo "done."
......
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