Update mbr.S

diff --git a/debian/changelog b/debian/changelog
index 31d4dd9..1fe0c79 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ grml2usb (0.9.3) UNRELEASED; urgency=low
 
   * Add zsh completion for grml2usb.
   * Drop some leftover 'lang=us' references.
+  * Update mbr.S (thanks, Thorsten Glaser).
 
- -- Michael Prokop <mika@grml.org>  Wed, 04 Mar 2009 12:28:02 +0100
+ -- Michael Prokop <mika@grml.org>  Wed, 04 Mar 2009 12:28:54 +0100
 
 grml2usb (0.9.2) unstable; urgency=low
 

diff --git a/mbr/Makefile b/mbr/Makefile
index a49b66a..de0e841 100644 (file)
--- a/mbr/Makefile
+++ b/mbr/Makefile
@@ -1,15 +1,17 @@
+# https://www.mirbsd.org/cvs.cgi/~checkout~/src/sys/arch/i386/stand/mbr/mbr.S
+
 all: mbrmgr mbrldr
 
 clean:
        rm -f mbrmgr mbrldr mbrmgr.elf mbr.o
 
 mbrmgr:
-       gcc -D_ASM_SOURCE -DBOOTMANAGER -D__BOOT_VER=\"0AA6\" -c mbr.S
+       $(CC) -D_ASM_SOURCE -DBOOTMANAGER -D__BOOT_VER=\"0AA6\" -c mbr.S
        ld -nostdlib -Ttext 0x0600 -N -Bstatic -e _start -o mbrmgr.elf mbr.o
        objcopy -O binary mbrmgr.elf mbrmgr
 
 # bootloader, without a bootmenu
 mbrldr:
-       gcc -D_ASM_SOURCE -UBOOTMANAGER -D__BOOT_VER=\"0AA6\" -c mbr.S
+       $(CC) -D_ASM_SOURCE -UBOOTMANAGER -DBOOT_QUIET -D__BOOT_VER=\"0AA6\" -c mbr.S
        ld -nostdlib -Ttext 0x0600 -N -Bstatic -e _start -o mbrmgr.elf mbr.o
        objcopy -O binary mbrmgr.elf mbrldr

diff --git a/mbr/mbr.S b/mbr/mbr.S
index fc0400b..3f69c26 100644 (file)
--- a/mbr/mbr.S
+++ b/mbr/mbr.S
@@ -1,4 +1,4 @@
-/* $MirOS: src/sys/arch/i386/stand/mbr/mbr.S,v 1.12 2009/01/31 23:39:55 tg Exp $ */
+/* $MirOS: src/sys/arch/i386/stand/mbr/mbr.S,v 1.13 2009/03/04 10:50:28 tg Exp $ */
 
 /*-
  * Copyright (c) 2009
@@ -23,6 +23,9 @@
  *     $ gcc -D_ASM_SOURCE -DBOOTMANAGER -D__BOOT_VER=\"0AA6\" -c mbr.S
  *     $ ld -nostdlib -Ttext 0x0600 -N -Bstatic -e _start -o mbrmgr.elf mbr.o
  *     $ objcopy -O binary mbrmgr.elf mbrmgr
+ *     $ gcc -D_ASM_SOURCE -DBOOT_QUIET -D__BOOT_VER=\"0AA6\" -c mbr.S
+ *     $ ld -nostdlib -Ttext 0x0600 -N -Bstatic -e _start -o mbrldr.elf mbr.o
+ *     $ objcopy -O binary mbrldr.elf mbrldr
  */
 
        .intel_syntax noprefix
@@ -91,6 +94,8 @@ Lmain:        sti
        mov     di,offset Lem03
        mov     al,ds:[Lptab + 0x34]
        call    LpBY
+#endif
+#if !defined(BOOT_QUIET) || defined(BOOTMANAGER)
        mov     si,offset Lemsg
        call    Lotxt
 #endif