Update to bsd4grml version 20100815.

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

diff --git a/debian/copyright b/debian/copyright
index f898666..25c65a7 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -47,7 +47,7 @@ License information for the syslinux files shipped as
 License information for the bsd4grml files shipped as
 /usr/share/grml-live/templates/boot/addons/bsd4grml:
 
-   Downloaded from <https://eurynome.mirbsd.org/~tg/pub/bsd4grml.tgz>.
+   Downloaded from <https://dl.mirbsd.org/MirOS/current/bsd4grml-20100815.tgz>.
    Thorsten "mirabilos" Glaser <tg@mirbsd.de>
    See /usr/share/grml-live/templates/boot/addons/bsd4grml/LICENCE.TXT
    for details.

diff --git a/templates/boot/addons/bsd4grml/bsd.rd b/templates/boot/addons/bsd4grml/bsd.rd
index b390516..3481361 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 dde148a..85ab1c0 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 e8db95b..d714231 100644 (file)
--- a/templates/boot/addons/bsd4grml/ldbsd.txt
+++ b/templates/boot/addons/bsd4grml/ldbsd.txt
@@ -480,6 +480,8 @@ CAVEATS
                 gPXE, but no code yet. For now, gPXE can load boot using Mul-
                 tiboot, and any passed modules are handled via lmbmfs.
 
-     ustarfs    This filesystem will be implemented soon.
+     ustarfs    This filesystem is currently only usable with the boot floppy
+                and assumes that the entire floppy disc (except, on sparc, the
+                MD disklabel) is a valid ustar archive.
 
-MirOS BSD #10-current          October 27, 2009                              7
+MirOS BSD #10-current           August 6, 2010                               7

diff --git a/templates/boot/addons/bsd4grml/loopback.0 b/templates/boot/addons/bsd4grml/loopback.0
new file mode 100644 (file)
index 0000000..0c75de1
--- /dev/null
+++ b/templates/boot/addons/bsd4grml/loopback.0
@@ -0,0 +1,21 @@
+# $MirOS: src/distrib/common/grml/loopback.0,v 1.2 2010/08/15 17:03:31 tg Exp $
+#
+set image /bsd
+set timeout 12
+macro grub1 echo GRUB-legacy is deactivated in loopback.cfg!
+macro grub2 echo GRUB 2 is deactivated in loopback.cfg!
+macro grml echo GRUB is deactivated in loopback.cfg!
+macro slx machine exec dos
+echo
+echo ==================================================================
+echo # MirOS BSD #10-current [grml] | (c) 2002-2010 The MirOS Project #
+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 Switching to GRUB again is deactivated in loopback.cfg. 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.
+echo

diff --git a/templates/boot/addons/bsd4grml/loopback.1 b/templates/boot/addons/bsd4grml/loopback.1
new file mode 100644 (file)
index 0000000..86d48bb
--- /dev/null
+++ b/templates/boot/addons/bsd4grml/loopback.1
@@ -0,0 +1,6 @@
+# $MirOS: src/distrib/common/grml/loopback.1,v 1.1 2010/08/06 15:40:03 tg Exp $
+#
+echo
+echo Booting the MirOS BSD rescue system
+echo
+boot /bsd

diff --git a/templates/boot/addons/bsd4grml/loopback.2 b/templates/boot/addons/bsd4grml/loopback.2
new file mode 100644 (file)
index 0000000..5f7c3b7
--- /dev/null
+++ b/templates/boot/addons/bsd4grml/loopback.2
@@ -0,0 +1,6 @@
+# $MirOS: src/distrib/common/grml/loopback.2,v 1.1 2010/08/06 15:40:03 tg Exp $
+#
+echo
+echo Booting the MirOS BSD rescue system into UKC
+echo
+boot /bsd -c

diff --git a/templates/boot/addons/bsd4grml/loopback.3 b/templates/boot/addons/bsd4grml/loopback.3
new file mode 100644 (file)
index 0000000..adc489f
--- /dev/null
+++ b/templates/boot/addons/bsd4grml/loopback.3
@@ -0,0 +1,13 @@
+# $MirOS: src/distrib/common/grml/loopback.3,v 1.1 2010/08/06 15:40:03 tg Exp $
+#
+echo
+echo Booting the MirOS BSD rescue system (serial console)
+echo COM1 (tty00) at 9600 bps, 8N1
+echo
+stty com0 9600
+set tty com0
+echo
+echo Booting the MirOS BSD rescue system (serial console)
+echo COM1 (tty00) at 9600 bps, 8N1
+echo
+boot /bsd

diff --git a/templates/boot/addons/bsd4grml/loopback.4 b/templates/boot/addons/bsd4grml/loopback.4
new file mode 100644 (file)
index 0000000..d2d7087
--- /dev/null
+++ b/templates/boot/addons/bsd4grml/loopback.4
@@ -0,0 +1,13 @@
+# $MirOS: src/distrib/common/grml/loopback.4,v 1.1 2010/08/06 15:40:03 tg Exp $
+#
+echo
+echo Booting the MirOS BSD rescue system (serial console)
+echo COM1 (tty00) at 38400 bps, 8N1
+echo
+stty com0 38400
+set tty com0
+echo
+echo Booting the MirOS BSD rescue system (serial console)
+echo COM1 (tty00) at 38400 bps, 8N1
+echo
+boot /bsd

diff --git a/templates/boot/addons/bsd4grml/loopback.5 b/templates/boot/addons/bsd4grml/loopback.5
new file mode 100644 (file)
index 0000000..51ecc22
--- /dev/null
+++ b/templates/boot/addons/bsd4grml/loopback.5
@@ -0,0 +1,13 @@
+# $MirOS: src/distrib/common/grml/loopback.5,v 1.1 2010/08/06 15:40:03 tg Exp $
+#
+echo
+echo Booting the MirOS BSD rescue system (serial console)
+echo COM1 (tty00) at 115200 bps, 8N1
+echo
+stty com0 115200
+set tty com0
+echo
+echo Booting the MirOS BSD rescue system (serial console)
+echo COM1 (tty00) at 115200 bps, 8N1
+echo
+boot /bsd

diff --git a/templates/boot/addons/bsd4grml/loopback.6 b/templates/boot/addons/bsd4grml/loopback.6
new file mode 100644 (file)
index 0000000..8311142
--- /dev/null
+++ b/templates/boot/addons/bsd4grml/loopback.6
@@ -0,0 +1,6 @@
+# $MirOS: src/distrib/common/grml/loopback.6,v 1.1 2010/08/06 15:40:03 tg Exp $
+#
+echo
+echo Switching to GRUB again is deactivated in loopback.cfg.
+echo
+set timeout 0

diff --git a/templates/boot/grub/grub.cfg b/templates/boot/grub/grub.cfg
index 0cb37b1..d040156 100644 (file)
--- a/templates/boot/grub/grub.cfg
+++ b/templates/boot/grub/grub.cfg
@@ -52,23 +52,39 @@ menuentry "FreeDOS" {
     initrd  /boot/addons/balder10.imz
 }
 
-menuentry "MirOS bsd4grml (regular method)" {
-    multiboot   /boot/addons/bsd4grml/ldbsd.com
-}
-
-menuentry "MirOS bsd4grml (fallback method)" {
-    multiboot   /boot/addons/bsd4grml/ldbsd.com
-    module      /boot/addons/bsd4grml/bsd.rd
-    module      /boot/addons/bsd4grml/boot.1
-    module      /boot/addons/bsd4grml/boot.2
-    module      /boot/addons/bsd4grml/boot.3
-    module      /boot/addons/bsd4grml/boot.4
-    module      /boot/addons/bsd4grml/boot.5
-    module      /boot/addons/bsd4grml/boot.6
-    module      /boot/addons/bsd4grml/boot.cfg
-    module      /boot/grub/%GRUB_LEGACY%
-    module      /boot/grub/core.img
-}
+if [ ${iso_path} ] ; then
+    # assume loopback.cfg boot
+    menuentry "MirOS bsd4grml (via loopback)" {
+        multiboot   /boot/addons/bsd4grml/ldbsd.com
+        module      /boot/addons/bsd4grml/bsd.rd bsd
+        module      /boot/addons/bsd4grml/loopback.0 boot.cfg
+        module      /boot/addons/bsd4grml/loopback.1 boot.1
+        module      /boot/addons/bsd4grml/loopback.2 boot.2
+        module      /boot/addons/bsd4grml/loopback.3 boot.3
+        module      /boot/addons/bsd4grml/loopback.4 boot.4
+        module      /boot/addons/bsd4grml/loopback.5 boot.5
+        module      /boot/addons/bsd4grml/loopback.6 boot.6
+    }
+else
+    # assume grub.cfg boot
+    menuentry "MirOS bsd4grml (regular method)" {
+        multiboot   /boot/addons/bsd4grml/ldbsd.com
+    }
+
+    menuentry "MirOS bsd4grml (fallback method)" {
+        multiboot   /boot/addons/bsd4grml/ldbsd.com
+        module      /boot/addons/bsd4grml/bsd.rd bsd.rd
+        module      /boot/addons/bsd4grml/boot.1 boot.1
+        module      /boot/addons/bsd4grml/boot.2 boot.2
+        module      /boot/addons/bsd4grml/boot.3 boot.3
+        module      /boot/addons/bsd4grml/boot.4 boot.4
+        module      /boot/addons/bsd4grml/boot.5 boot.5
+        module      /boot/addons/bsd4grml/boot.6 boot.6
+        module      /boot/addons/bsd4grml/boot.cfg boot.cfg
+        module      /boot/grub/%GRUB_LEGACY% %GRUB_LEGACY%
+        module      /boot/grub/core.img core.img
+    }
+fi
 
 menuentry "Boot OS of first partition on first disk" {
     set root=(hd0,1)

diff --git a/templates/boot/grub/menu.lst b/templates/boot/grub/menu.lst
index 15facd9..0dfa232 100644 (file)
--- a/templates/boot/grub/menu.lst
+++ b/templates/boot/grub/menu.lst
@@ -67,14 +67,14 @@ kernel /boot/addons/bsd4grml/ldbsd.com
 
 title MirOS bsd4grml (fallback method)
 kernel /boot/addons/bsd4grml/ldbsd.com
-modulenounzip /boot/addons/bsd4grml/bsd.rd
-module /boot/addons/bsd4grml/boot.1
-module /boot/addons/bsd4grml/boot.2
-module /boot/addons/bsd4grml/boot.3
-module /boot/addons/bsd4grml/boot.4
-module /boot/addons/bsd4grml/boot.5
-module /boot/addons/bsd4grml/boot.6
-module /boot/addons/bsd4grml/boot.cfg
-module /boot/grub/%GRUB_LEGACY%
-module /boot/grub/core.img
+modulenounzip /boot/addons/bsd4grml/bsd.rd bsd.rd
+module /boot/addons/bsd4grml/boot.1 boot.1
+module /boot/addons/bsd4grml/boot.2 boot.2
+module /boot/addons/bsd4grml/boot.3 boot.3
+module /boot/addons/bsd4grml/boot.4 boot.4
+module /boot/addons/bsd4grml/boot.5 boot.5
+module /boot/addons/bsd4grml/boot.6 boot.6
+module /boot/addons/bsd4grml/boot.cfg boot.cfg
+modulenounzip /boot/grub/%GRUB_LEGACY% %GRUB_LEGACY%
+modulenounzip /boot/grub/core.img core.img