git://git.onelab.eu
/
nodemanager.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b84078d
)
for f14 rootfs, as tweaking with systemd would fail due to missing dir
author
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Sat, 1 Feb 2014 11:07:42 +0000
(12:07 +0100)
committer
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Sat, 1 Feb 2014 11:07:42 +0000
(12:07 +0100)
initscript.py
patch
|
blob
|
history
diff --git
a/initscript.py
b/initscript.py
index
b448261
..
7a270da
100644
(file)
--- a/
initscript.py
+++ b/
initscript.py
@@
-19,13
+19,18
@@
class Initscript:
self.refresh_slice_vinit()
def install_and_enable_vinit (self):
self.refresh_slice_vinit()
def install_and_enable_vinit (self):
+ "prepare sliver rootfs init and systemd so the vinit service kicks in"
# the fact that systemd attempts to run old-style services
# the fact that systemd attempts to run old-style services
- # says we should do either o
r
or the other and not both
+ # says we should do either o
ne
or the other and not both
# but actually if that was true we could just do it for init and be fine
# which is not what we've seen starting with f18
# but actually if that was true we could just do it for init and be fine
# which is not what we've seen starting with f18
- # so for now let's do it for both systems unconditionnally
- self.install_and_enable_vinit_for_init ()
- self.install_and_enable_vinit_for_systemd ()
+ # so for now let's try to do it for both systems unconditionnally
+ #
+ # this being said all the paths do not necessarily exist on all flavours of rootfs
+ try: self.install_and_enable_vinit_for_init ()
+ except: pass
+ try: self.install_and_enable_vinit_for_systemd ()
+ except: pass
# unconditionnally install and enable the generic vinit script
# mimicking chkconfig for enabling the generic vinit script
# unconditionnally install and enable the generic vinit script
# mimicking chkconfig for enabling the generic vinit script