git://git.onelab.eu
/
plcapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
an attempt to get more feedback from a node that fails to boot
[plcapi.git]
/
PLC
/
Methods
/
GetBootMedium.py
diff --git
a/PLC/Methods/GetBootMedium.py
b/PLC/Methods/GetBootMedium.py
index
83917f1
..
7b73a93
100644
(file)
--- a/
PLC/Methods/GetBootMedium.py
+++ b/
PLC/Methods/GetBootMedium.py
@@
-457,8
+457,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":
@@
-478,6
+483,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))