projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
run dsa-check-hpssacli out of cron on smartarraycontroller_hpsa hosts
[mirror/dsa-puppet.git]
/
modules
/
grub
/
templates
/
puppet-kernel-serial.cfg.erb
diff --git
a/modules/grub/templates/puppet-kernel-serial.cfg.erb
b/modules/grub/templates/puppet-kernel-serial.cfg.erb
index
4d03940
..
55ff4a0
100644
(file)
--- a/
modules/grub/templates/puppet-kernel-serial.cfg.erb
+++ b/
modules/grub/templates/puppet-kernel-serial.cfg.erb
@@
-1,6
+1,8
@@
-<%- if %w{arm-conova-01 arm-arm-01}.include?(hostname) then -%>
+<%- if %w{arm-conova-01 arm-arm-01}.include?(
@
hostname) then -%>
GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=ttyAMA0,115200n8"
GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=ttyAMA0,115200n8"
-<%- elsif %w{aagaard acker}.include?(hostname) then -%>
+<%- elsif %w{arm-arm-03}.include?(@hostname) then -%>
+GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=ttyS0,115200"
+<%- elsif %w{aagaard acker}.include?(@hostname) then -%>
GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=ttyS0,115200 earlycon"
<% else -%>
GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=tty0 console=ttyS0,115200n8"
GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=ttyS0,115200 earlycon"
<% else -%>
GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=tty0 console=ttyS0,115200n8"