sablink/entropy
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Entropy/TriggerInterface:

Browse Source 
- remove duplicated functions and routines related to /etc/init.d services handling


git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@2332 cd1c1023-2f26-0410-ae45-c471fc1f0318
This commit is contained in:
lxnay
2008-08-26 10:23:56 +00:00
parent b4a124b8d3
commit a19306ba36
1 changed files with 16 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/entropy.py
+16 -52
View File
@@ -8667,7 +8667,7 @@ class TriggerInterface:
if x.startswith('/boot/kernel-'):
functions.add('removebootablekernel')
if x.startswith('/etc/init.d/'):
functions.add('removeinit')
functions.add('initdisable')
if x.endswith('.py'):
functions.add('cleanpy')
if x.startswith('/etc/env.d/'):
@@ -8703,10 +8703,9 @@ class TriggerInterface:
functions.add("openglsetup_xorg")
for x in self.pkgdata['removecontent']:
if x.startswith("/etc/init.d/"):
functions.add('initdisable')
if x.startswith("/boot"):
functions.add('mountboot')
break
return functions
@@ -9063,14 +9062,21 @@ class TriggerInterface:
for item in self.pkgdata['removecontent']:
item = etpConst['systemroot']+item
if item.startswith(etpConst['systemroot']+"/etc/init.d/") and os.path.isfile(item):
# running?
#running = os.path.isfile(etpConst['systemroot']+self.INITSERVICES_DIR+'/started/'+os.path.basename(item))
if not etpConst['systemroot']:
myroot = "/"
else:
self.Entropy.clientLog.log(
ETP_LOGPRI_INFO,
ETP_LOGLEVEL_NORMAL,
"[POST] Removing boot service: %s" % (os.path.basename(item),)
)
mytxt = "%s: %s" % (brown(_("Removing boot service")),os.path.basename(item),)
self.Entropy.updateProgress(
mytxt,
importance = 0,
header = red(" ## ")
)
myroot = "/"
if etpConst['systemroot']:
myroot = etpConst['systemroot']+"/"
scheduled = not os.system('ROOT="'+myroot+'" rc-update show | grep '+os.path.basename(item)+'&> /dev/null')
self.trigger_initdeactivate(item, scheduled)
os.system('ROOT="'+myroot+'" rc-update del '+os.path.basename(item))
def trigger_initinform(self):
for item in self.pkgdata['content']:
@@ -9088,30 +9094,6 @@ class TriggerInterface:
header = red(" ## ")
)
def trigger_removeinit(self):
for item in self.pkgdata['removecontent']:
item = etpConst['systemroot']+item
if item.startswith(etpConst['systemroot']+"/etc/init.d/") and os.path.isfile(item):
self.Entropy.clientLog.log(
ETP_LOGPRI_INFO,
ETP_LOGLEVEL_NORMAL,
"[POST] Removing boot service: %s" % (os.path.basename(item),)
)
mytxt = "%s: %s" % (brown(_("Removing boot service")),os.path.basename(item),)
self.Entropy.updateProgress(
mytxt,
importance = 0,
header = red(" ## ")
)
if not etpConst['systemroot']:
myroot = "/"
else:
myroot = etpConst['systemroot']+"/"
try:
os.system('ROOT="'+myroot+'" rc-update del '+os.path.basename(item)+' &> /dev/null')
except:
pass
def trigger_openglsetup(self):
opengl = "xorg-x11"
if self.pkgdata['name'] == "nvidia-drivers":
@@ -10119,24 +10101,6 @@ class TriggerInterface:
pass
return 0
'''
@description: shuts down selected init script, and remove from runlevel
@output: returns int() as exit status
'''
def trigger_initdeactivate(self, item, scheduled):
if not etpConst['systemroot']:
myroot = "/"
'''
causes WORLD to fall under
if (running):
os.system(item+' stop --quiet')
'''
else:
myroot = etpConst['systemroot']+"/"
if (scheduled):
os.system('ROOT="'+myroot+'" rc-update del '+os.path.basename(item))
return 0
def __get_entropy_kernel_grub_line(self, kernel):
return "title="+etpConst['systemname']+" ("+os.path.basename(kernel)+")\n"