projects
/
grml-live-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Drop lang=de which from grml.cfg
[grml-live-grml.git]
/
templates
/
boot
/
addons
/
bsd4grml
/
boot.cfg
diff --git
a/templates/boot/addons/bsd4grml/boot.cfg
b/templates/boot/addons/bsd4grml/boot.cfg
index
d8f274d
..
5bfc278
100644
(file)
--- a/
templates/boot/addons/bsd4grml/boot.cfg
+++ b/
templates/boot/addons/bsd4grml/boot.cfg
@@
-1,6
+1,10
@@
+# $MirOS: src/distrib/common/grml/boot.cfg,v 1.2 2009/06/29 18:19:00 tg Exp $
+#
set image /boot/addons/bsd4grml/bsd.rd
set timeout 12
set image /boot/addons/bsd4grml/bsd.rd
set timeout 12
-macro grml machine exec grub /boot/addons/allinone.img
+macro grub1 machine exec grub /boot/grub/%GRUB_LEGACY%
+macro grub2 machine exec grub /boot/grub/core.img
+macro grml grub%GRUB_VERSION%
echo
echo ==================================================================
echo # MirOS BSD #10-current [grml] | (c) 2002-2009 The MirOS Project #
echo
echo ==================================================================
echo # MirOS BSD #10-current [grml] | (c) 2002-2009 The MirOS Project #
@@
-8,7
+12,7
@@
echo ==================================================================
echo
echo To boot the MirOS BSD based rescue system, wait twelve seconds or
echo enter the command 'boot'. Join irc.freenode.net #MirBSD for help.
echo
echo To boot the MirOS BSD based rescue system, wait twelve seconds or
echo enter the command 'boot'. Join irc.freenode.net #MirBSD for help.
-echo To switch to
GNU GRUB
again, type the command 'grml' below.
+echo To switch to
the grml loader
again, type the command 'grml' below.
echo
echo Use "stty com0 9600" to change the speed from the default of 9600
echo bps (always 8N1) and "set tty com0" to use a serial console.
echo
echo Use "stty com0 9600" to change the speed from the default of 9600
echo bps (always 8N1) and "set tty com0" to use a serial console.