Changeset 416

Timestamp:

01/13/09 18:15:46 (3 years ago)

Author:

tschmitt

Message:

• Aktualisierung von cloop auf Version 2.628.
• Neue start.conf-KERNEL-Wert "reboot" für Windows-Systeme, veranlasst einen Reboot des Clients anstatt das BS zu starten.

Location:

main/linuxmuster-linbo/trunk

Files:

• debian/changelog (modified) (1 diff)
• debian/md5sums.src (modified) (1 diff)
• debian/rules (modified) (1 diff)
• linbo/linbo_cmd.sh (modified) (4 diffs)

main/linuxmuster-linbo/trunk/debian/changelog

@@ +1 @@
+linuxmuster-linbo (1.1.5-1) unstable; urgency=low
+
+  * added "reboot" start.conf KERNEL value for Windows systems, which will not boot
+    with grub.exe/badgrub.exe.
+  * updated cloop to version 2.628-2.
+  * removed cloop-2.6.27.diff.
+
+ -- Thomas Schmitt <schmitt@lmz-bw.de>  Tue, 13 Jan 2009 17:04:18 +0100
+
 linuxmuster-linbo (1.1.4-1) unstable; urgency=low
 

main/linuxmuster-linbo/trunk/debian/md5sums.src

@@ -1 +1 @@
 1a47c00828c7b38b7516f6fdc35800e2  busybox-1.12.2.tar.bz2
 09addfe7ae469677da39ed66d83858d3  chntpw-source-080526.zip
-876e1f0951cb00c8a5fea23383f99706  cloop_2.625-1.tar.gz
+b44b62af69863fc74f2946a56466d19d  cloop_2.628-2.tar.gz
 2d6e20006cb07fbdb25b25a9d615ea64  grub4dos-0.4.4-2009-01-11-src.zip
 d9f2ecd3c3307905f24130a25816e6cc  kexec-tools-2.0.0.tar.bz2

main/linuxmuster-linbo/trunk/debian/rules

@@ -189 +189 @@
                 echo "[1mUnpacking $(CLOOP_ARCHIVE)...[0m" ; \
                 tar xf cache/$(CLOOP_ARCHIVE) -C kernel; \
-                echo "[1mPatching cloop sources...[0m" ; \
-                ( cd $(CLOOP_DIR) && for i in ../../patches/cloop/*; do patch -p1 <$$i; done ); \
+                #echo "[1mPatching cloop sources...[0m" ; \
+                #( cd $(CLOOP_DIR) && for i in ../../patches/cloop/*; do patch -p1 <$$i; done ); \
                 ln -sf ../$(CLOOP_DIR) kernel/cloop; \
         fi

main/linuxmuster-linbo/trunk/linbo/linbo_cmd.sh

@@ -548 +548 @@
   case "$3" in
    *[Gg][Rr][Uu][Bb].[Ee][Xx][Ee]*)
-    # Load grub.exe preferably from cache partition, if present
-#    if [ -r "/cache/$3" ]; then
-#     KERNEL="/cache/$3"
-     # mkgrubmenu "$1"
-     # grub-set-default --root-directory=/cache 1
-     #WINDOWS="yes"
-#     LOADED="true"
-#    fi
-#    [ -r "$KERNEL" ] || KERNEL="/usr/lib/grub.exe" # Use builtin
     # tschmitt: use builtin grub.exe or badgrub.exe in any case
     KERNEL="/usr/lib/$3"
@@ -563 +554 @@
     [ -z "$APPEND" ] && APPEND="--config-file=map(rd) (hd0,0); map --hook; chainloader (hd0,0)/ntldr; rootnoverify(hd0,0) --device-map=(hd0) $disk"
     ;;
-   *[Pp][Xx][Ee][Gg][Rr][Uu][Bb]*)
-     # tschmitt: if kernel is pxegrub assume that it is a real windows, which has to be rebootet
+   *[Rr][Ee][Bb][Oo][Oo][Tt]*)
+     # tschmitt: if kernel is "reboot" assume that it is a real windows, which has to be rebootet
      WINDOWS="yes"
      LOADED="true"
@@ -572 +563 @@
       grub-set-default --root-directory=/cache 1
      fi
-     # oehler: set windows boot flag
-     flag="$(printf '\%o' 1)"
-     echo -n -e "$flag" | dd seek=432 bs=1 count=1 of=$disk conv=notrunc
      ;;
    *)
@@ -641 +629 @@
    sleep 2
    reboot -f
-   sleep 10
+   #sleep 10
   fi
  else