git://git.onelab.eu
/
plcapi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
da06561
)
an attempt to get more feedback from a node that fails to boot
author
parmentelat
<thierry.parmentelat@inria.fr>
Mon, 17 Dec 2018 15:45:23 +0000
(16:45 +0100)
committer
parmentelat
<thierry.parmentelat@inria.fr>
Mon, 17 Dec 2018 15:51:51 +0000
(16:51 +0100)
PLC/Methods/GetBootMedium.py
patch
|
blob
|
history
diff --git
a/PLC/Methods/GetBootMedium.py
b/PLC/Methods/GetBootMedium.py
index
26b8372
..
b7cd3c2
100644
(file)
--- a/
PLC/Methods/GetBootMedium.py
+++ b/
PLC/Methods/GetBootMedium.py
@@
-451,8
+451,13
@@
class GetBootMedium(Method):
elif tag['tagname'] == 'no-hangcheck':
build_sh_spec['kargs'].append('hcheck_reboot0')
elif tag['tagname'] == 'systemd-debug':
elif tag['tagname'] == 'no-hangcheck':
build_sh_spec['kargs'].append('hcheck_reboot0')
elif tag['tagname'] == 'systemd-debug':
+ #
build_sh_spec['kargs'].append('systemd.log_level=debug')
build_sh_spec['kargs'].append('systemd.log_target=console')
build_sh_spec['kargs'].append('systemd.log_level=debug')
build_sh_spec['kargs'].append('systemd.log_target=console')
+ build_sh_spec['kargs'].append(
+ 'systemd.default_standard_output=journal+console')
+ build_sh_spec['kargs'].append(
+ 'systemd.default_standard_error=journal+console')
# then options can override tags
for option in options:
if option == "cramfs":
# then options can override tags
for option in options:
if option == "cramfs":
@@
-472,6
+477,11
@@
class GetBootMedium(Method):
build_sh_spec['kargs'].append('hcheck_reboot0')
elif option == "systemd-debug":
build_sh_spec['kargs'].append('systemd.log_level=debug')
build_sh_spec['kargs'].append('hcheck_reboot0')
elif option == "systemd-debug":
build_sh_spec['kargs'].append('systemd.log_level=debug')
+ build_sh_spec['kargs'].append('systemd.log_target=console')
+ build_sh_spec['kargs'].append(
+ 'systemd.default_standard_output=journal+console')
+ build_sh_spec['kargs'].append(
+ 'systemd.default_standard_error=journal+console')
else:
raise PLCInvalidArgument("unknown option {}".format(option))
else:
raise PLCInvalidArgument("unknown option {}".format(option))