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

slapos will be install/updated at the end of slapprepare

parent 79e7303f
......@@ -32,6 +32,7 @@ from shutil import move
from subprocess import call as subprocessCall
import sys
import urllib2
from slapupdate import main as slapupdate
SLAPOS_MARK='# Added by SlapOS\n'
......@@ -316,6 +317,7 @@ def configureNtp():
new_ntp.close()
_call(['chkconfig', '--add', 'ntp'])
_call(['systemctl', 'enable', 'ntp.service'])
_call(['systemctl', 'restart', 'ntp.service'])
class Config:
......@@ -428,14 +430,18 @@ def slapprepare():
if not config.one_disk:
_call(['/etc/init.d/slapos_firstboot'])
try:
# Enable but do not run slapos-boot-dedicated.service
_call(['systemctl','enable','slapos-boot-dedicated.service'])
_call(['systemctl','stop','slapos-boot-dedicated.service'])
# Install/update slapos
_call(['zypper','addrepo', '-fc' ,'-n','"SlapOS Official repo"'
,'http://download.opensuse.org/repositories/home:/VIFIBnexedi/openSUSE_12.1/', 'slapos'])
except ValueError :
print "SlapOS repository was already there"
pass
_call('zypper','--gpg-auto-import-keys','install','-fy','slapos.node')
# Update computer
slapupdate()
_call(['systemctl','enable','slapos-boot-dedicated.service'])
_call(['systemctl','start','slapos-boot-dedicated.service'])
return_code = 0
......
......@@ -28,7 +28,6 @@
systemctl stop slapos-node.service
systemctl disable slapos-node.service
systemctl restart ntp.service
# clean the system
for service in rpcbind network-remotefs postfix ; do
......
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