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:
4a64676
)
install for sytemd *or* init
systemd
author
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Sat, 1 Feb 2014 13:37:46 +0000
(14:37 +0100)
committer
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Sat, 1 Feb 2014 13:37:46 +0000
(14:37 +0100)
initscript.py
patch
|
blob
|
history
diff --git
a/initscript.py
b/initscript.py
index
7a270da
..
52096eb
100644
(file)
--- a/
initscript.py
+++ b/
initscript.py
@@
-24,13
+24,10
@@
class Initscript:
# says we should do either one 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
# says we should do either one 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
- # 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
+ # so we try for a systemd system, and if it fails it means
+ # one of the dir does not exist and so we are dealing with an init-based rootfs
try: self.install_and_enable_vinit_for_systemd ()
try: self.install_and_enable_vinit_for_systemd ()
- except:
pass
+ except:
self.install_and_enable_vinit_for_init ()
# 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