Update boot script to new entry points.

parent 7ff548cd
...@@ -46,15 +46,15 @@ fi ...@@ -46,15 +46,15 @@ fi
# Run slapformat # Run slapformat
i=1 i=1
echo -n "Running slapformat..." echo -n "Running slapos node format..."
/opt/slapos/bin/slapformat --now --console --log_file=/opt/slapos/slapformat.log $SLAPOS_CONFIGURATION/slapos.cfg /opt/slapos/bin/slapos node format --now --console --log_file=/opt/slapos/log/slapos-node-format.log $SLAPOS_CONFIGURATION/slapos.cfg
while [ $? != 0 ]; do while [ $? != 0 ]; do
sleep $(($i*60)) sleep $(($i*60))
if [ $i -le 20 ]; then if [ $i -le 20 ]; then
let i++ let i++
fi fi
echo "Retrying slapformat" echo "Retrying slapos node format"
/opt/slapos/bin/slapformat --now --console --verbose --log_file=/opt/slapos/slapformat.log $SLAPOS_CONFIGURATION/slapos.cfg /opt/slapos/bin/slapos node format --now --console --verbose --log_file=/opt/slapos/log/slapos-node-format.log $SLAPOS_CONFIGURATION/slapos.cfg
done done
if [ $ONLY_SLAPFORMAT = false ]; then if [ $ONLY_SLAPFORMAT = false ]; then
...@@ -75,8 +75,8 @@ if [ $ONLY_SLAPFORMAT = false ]; then ...@@ -75,8 +75,8 @@ if [ $ONLY_SLAPFORMAT = false ]; then
# Delete timestamp of all partitions so that it will force slapgrid to process them. # Delete timestamp of all partitions so that it will force slapgrid to process them.
rm /srv/slapgrid/slappart*/.timestamp 2>/dev/null rm /srv/slapgrid/slappart*/.timestamp 2>/dev/null
# Run slapgrid now. # Start instances
/opt/slapos/bin/slapgrid-cp --verbose --now --logfile=/opt/slapos/slapgrid-cp.log --pidfile=/opt/slapos/slapgrid-cp.pid $SLAPOS_CONFIGURATION/slapos.cfg >> /opt/slapos/slapgrid-cp.log 2>&1 /opt/slapos/bin/slapos node instance --verbose --logfile=/opt/slapos/log/slapos-node-instance.log --pidfile=/opt/slapos/slapgrid-cp.pid $SLAPOS_CONFIGURATION/slapos.cfg >> /opt/slapos/slapgrid-cp.log 2>&1
fi fi
exit 0 exit 0
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