projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Gah, puppet!
[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
f35ad04
..
0bd187c
100644
(file)
--- a/
modules/grub/templates/puppet-kernel-serial.cfg.erb
+++ b/
modules/grub/templates/puppet-kernel-serial.cfg.erb
@@
-1,9
+1,11
@@
-<%- if %w{a
rm-conova-01 arm-arm-01}.include?(
hostname) then -%>
+<%- if %w{a
mdahl arm-conova-01 arm-conova-02 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{arm-arm-03}.include?(hostname) then -%>
+<%- elsif %w{arm-arm-03}.include?(
@
hostname) then -%>
GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=ttyS0,115200"
GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=ttyS0,115200"
-<%- elsif %w{
aagaard acker}.include?(
hostname) then -%>
+<%- elsif %w{
conova-node01 conova-node02}.include?(@
hostname) then -%>
GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=ttyS0,115200 earlycon"
GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=ttyS0,115200 earlycon"
+<%- elsif %w{storace fasolo klecker clementi czerny}.include?(@hostname) then -%>
+GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=tty0 console=ttyS1,115200n8"
<% else -%>
GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=tty0 console=ttyS0,115200n8"
<%- end -%>
<% else -%>
GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=tty0 console=ttyS0,115200n8"
<%- end -%>