Commit f3ea6a7f authored by Cédric Le Ninivin's avatar Cédric Le Ninivin

slapos rpm will be installed if it was not

parent 1eb463f1
...@@ -91,6 +91,11 @@ SLAP_INSTALL_LOG=/opt/slapos/slapos-install.log ...@@ -91,6 +91,11 @@ SLAP_INSTALL_LOG=/opt/slapos/slapos-install.log
while :; do while :; do
if [ -f /opt/slapos/bin/slapformat ] && [ -f /opt/slapos/bin/bang ]; then if [ -f /opt/slapos/bin/slapformat ] && [ -f /opt/slapos/bin/bang ]; then
zypper search -i slapos.node | grep slapos.node > /dev/null
if [ $? != 0 ]; then
echo -n "Installing SlapOS"
zypper --gpg-auto-import-keys install -fy slapos.node
fi
# slapos tools available, nothing to do # slapos tools available, nothing to do
break break
fi fi
...@@ -105,7 +110,7 @@ mkdir -v -p -m 0755 $repo ...@@ -105,7 +110,7 @@ mkdir -v -p -m 0755 $repo
# Fix path in case of old config: # Fix path in case of old config:
SLAPOS_GOOD_CONFIGURATION=/etc/opt/slapos SLAPOS_GOOD_CONFIGURATION=/etc/opt/slapos/
if [ $SLAPOS_GOOD_CONFIGURATION != $SLAPOS_CONFIGURATION ]; then if [ $SLAPOS_GOOD_CONFIGURATION != $SLAPOS_CONFIGURATION ]; then
sed -i "s|$SLAPOS_GOOD_CONFIGURATION|$SLAPOS_CONFIGURATION|g" /etc/cron.d/slapos-node sed -i "s|$SLAPOS_GOOD_CONFIGURATION|$SLAPOS_CONFIGURATION|g" /etc/cron.d/slapos-node
sed -i "s|$SLAPOS_GOOD_CONFIGURATION|$SLAPOS_CONFIGURATION|g" /usr/sbin/slapos-start sed -i "s|$SLAPOS_GOOD_CONFIGURATION|$SLAPOS_CONFIGURATION|g" /usr/sbin/slapos-start
......
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