Update bsd4grml to version 20091027

diff --git a/debian/changelog b/debian/changelog
index 199c8b6..732d72a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,8 +15,9 @@ grml-live (0.9.28) UNRELEASED; urgency=low
     - templates/boot/isolinux/isolinux.bin
     - templates/boot/isolinux/vesamenu.c32
   * Adjust label text for grub1 boot entry.
+  * Update bsd4grml to version 20091027.
 
- -- Michael Prokop <mika@grml.org>  Tue, 27 Oct 2009 20:44:02 +0100
+ -- Michael Prokop <mika@grml.org>  Tue, 27 Oct 2009 20:54:33 +0100
 
 grml-live (0.9.27) unstable; urgency=low
 

diff --git a/templates/boot/addons/bsd4grml/LICENCE.TXT b/templates/boot/addons/bsd4grml/LICENCE.TXT
index ce8b244..2588ed1 100644 (file)
--- a/templates/boot/addons/bsd4grml/LICENCE.TXT
+++ b/templates/boot/addons/bsd4grml/LICENCE.TXT
@@ -422,4 +422,4 @@ BUGS
      MirOS project at <miros-discuss@mirbsd.org> if you think you have
      discovered a bug.
 
-MirOS                           June 29, 2009                                6
+MirOS                          August 30, 2009                               6

diff --git a/templates/boot/addons/bsd4grml/boot.cfg b/templates/boot/addons/bsd4grml/boot.cfg
index 5bfc278..42b65c0 100644 (file)
--- a/templates/boot/addons/bsd4grml/boot.cfg
+++ b/templates/boot/addons/bsd4grml/boot.cfg
@@ -1,10 +1,11 @@
-# $MirOS: src/distrib/common/grml/boot.cfg,v 1.2 2009/06/29 18:19:00 tg Exp $
+# $MirOS: src/distrib/common/grml/boot.cfg,v 1.3 2009/10/27 16:14:28 tg Exp $
 #
 set image /boot/addons/bsd4grml/bsd.rd
 set timeout 12
 macro grub1 machine exec grub /boot/grub/%GRUB_LEGACY%
 macro grub2 machine exec grub /boot/grub/core.img
 macro grml grub%GRUB_VERSION%
+macro slx machine exec dos
 echo
 echo ==================================================================
 echo # MirOS BSD #10-current [grml] | (c) 2002-2009 The MirOS Project #
@@ -12,7 +13,8 @@ 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 To switch to the grml loader again, type the command 'grml' below.
+echo To switch to GRUB again, type the command 'grml' below. To return
+echo to SYSLINUX, type 'slx' (this may not work but hang your system).
 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.

diff --git a/templates/boot/addons/bsd4grml/bsd.rd b/templates/boot/addons/bsd4grml/bsd.rd
index 922e678..1d90602 100644 (file)
Binary files a/templates/boot/addons/bsd4grml/bsd.rd and b/templates/boot/addons/bsd4grml/bsd.rd differ

diff --git a/templates/boot/addons/bsd4grml/ldbsd.com b/templates/boot/addons/bsd4grml/ldbsd.com
index 17f811c..9aa9976 100644 (file)
Binary files a/templates/boot/addons/bsd4grml/ldbsd.com and b/templates/boot/addons/bsd4grml/ldbsd.com differ

diff --git a/templates/boot/addons/bsd4grml/ldbsd.txt b/templates/boot/addons/bsd4grml/ldbsd.txt
index d3f263a..e8db95b 100644 (file)
--- a/templates/boot/addons/bsd4grml/ldbsd.txt
+++ b/templates/boot/addons/bsd4grml/ldbsd.txt
@@ -31,7 +31,11 @@ DESCRIPTION
 
      Basic operation procedure is as follows:
 
-     1.   Be loaded.
+     1.   Be loaded. However this is done, as the first thing we write a RETF
+          instruction to 0000:0000 and CALL FAR it (from 16-bit code), or
+          write a RET instruction to 0x00000000 and CALL it (from 32-bit
+          code), backing up the previous content of course, so that qemu+gdb
+          users can intercept via "b *0".
 
           BIOS       We are loaded to 0x07C00. The drive used to load us from
                      is passed in the DL register. The ES:BX and DS:SI regis-
@@ -267,12 +271,14 @@ COMMANDS
 
                              boot> machine mem -0x100000@0x00F00000
 
-             regs      Debugging command displaying register dumps.
-
              oldbios   Enable or disable the so-called "Old BIOS / Soekris
                        helper", which restricts boot from loading more than
                        one sector at a time from disc.
 
+             pxe       Forcibly scan for a PXE boot ROM.
+
+             regs      Debugging command displaying register dumps.
+
      macro   Displays the names of all currently defined macros. Up to four
              can be defined, holding up to 256 characters.
 
@@ -476,4 +482,4 @@ CAVEATS
 
      ustarfs    This filesystem will be implemented soon.
 
-MirOS BSD #10-current          October 24, 2009                              7
+MirOS BSD #10-current          October 27, 2009                              7