From: Thorsten Glaser <tg@mirbsd.org>
Date: Sun, 15 Nov 2009 13:44:12 +0000 (+0000)
Subject: Update MirOS bsd4grml to 20091115 including eKey support
X-Git-Tag: v0.9.33~22
X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=6efcb236c9b1df3bc4323e0e6c625ea25115e26a;hp=bdd6998b046fc690488a55eef9c71cccedb7203b

Update MirOS bsd4grml to 20091115 including eKey support

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
---

diff --git a/templates/boot/addons/bsd4grml/boot.6 b/templates/boot/addons/bsd4grml/boot.6
index 344befc..df846db 100644
--- a/templates/boot/addons/bsd4grml/boot.6
+++ b/templates/boot/addons/bsd4grml/boot.6
@@ -1,9 +1,9 @@
-# $MirOS: src/distrib/common/grml/boot.6,v 1.3 2009/08/13 14:34:01 tg Exp $
+# $MirOS: src/distrib/common/grml/boot.6,v 1.4 2009/10/29 00:17:37 tg Exp $
 #
 echo
 echo Switching to GNU GRUB %GRUB_VERSION% for booting
 echo into %RELEASE_INFO%
 echo
-macro grub1 machine exec grub /boot/grub/%GRUB_LEGACY%
+macro grub1 machine exec grub /boot/grub/stage2
 macro grub2 machine exec grub /boot/grub/core.img
 grub%GRUB_VERSION%
diff --git a/templates/boot/addons/bsd4grml/boot.cfg b/templates/boot/addons/bsd4grml/boot.cfg
index 42b65c0..fe75b26 100644
--- a/templates/boot/addons/bsd4grml/boot.cfg
+++ b/templates/boot/addons/bsd4grml/boot.cfg
@@ -1,8 +1,8 @@
-# $MirOS: src/distrib/common/grml/boot.cfg,v 1.3 2009/10/27 16:14:28 tg Exp $
+# $MirOS: src/distrib/common/grml/boot.cfg,v 1.4 2009/10/29 00:17:37 tg Exp $
 #
 set image /boot/addons/bsd4grml/bsd.rd
 set timeout 12
-macro grub1 machine exec grub /boot/grub/%GRUB_LEGACY%
+macro grub1 machine exec grub /boot/grub/stage2
 macro grub2 machine exec grub /boot/grub/core.img
 macro grml grub%GRUB_VERSION%
 macro slx machine exec dos
diff --git a/templates/boot/addons/bsd4grml/bsd.rd b/templates/boot/addons/bsd4grml/bsd.rd
index 1d90602..46ec5ee 100644
Binary files a/templates/boot/addons/bsd4grml/bsd.rd and b/templates/boot/addons/bsd4grml/bsd.rd differ