Support windows autostart feature; update doc

diff --git a/docs/grml-live.txt b/docs/grml-live.txt
index 1274ac0..2183a21 100644 (file)
--- a/docs/grml-live.txt
+++ b/docs/grml-live.txt
@@ -220,8 +220,7 @@ instead?)
 that are arch specific so we have a clean package list in all classes)
 
 * support different grml-flavours through classes right out-of-the-box (being:
-grml, grml64, grml-small for at least x86, amd64 and ppc) [currently it defaults
-to Debian/stable I386, unstable I386 works as well]
+grml, grml64, grml-small for at least x86, amd64 and ppc)
 
 * support setting grml-live configuration on the command line to provide
 different flavours using the commandline only
@@ -247,9 +246,6 @@ not as verbose unless you specify it, make it configurable)
 
 * support nocolor-option for /etc/grml/fai/grml/grml_cleanup_chroot
 
-* provide autostart-stuff (for Windows) inside root of $BUILD_TARGET (the
-grml-cd)
-
 Bugs
 ----
 

diff --git a/grml-live b/grml-live
index 572ef44..786eb75 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -169,15 +169,16 @@ if [ "$ARCH" = i386 ] ; then
       echo "  [x] $BUILD_TARGET/boot/isolinux exists already - skipping stage 'boot/isolinux'"
       continue
    else
+      # booting stuff:
       mkdir -p "$BUILD_TARGET"/boot/isolinux
       mkdir "$BUILD_TARGET"/GRML
-      cp /boot/memtest86+.bin                                       "$BUILD_TARGET"/boot/isolinux/memtest
-      cp "$CHROOT_TARGET"/boot/initrd*                              "$BUILD_TARGET"/boot/isolinux/initrd.gz
-      cp "$CHROOT_TARGET"/boot/vmlinuz*                             "$BUILD_TARGET"/boot/isolinux/linux26
-      cp /usr/lib/syslinux/chain.c32                                "$BUILD_TARGET"/boot/isolinux/
-      cp /usr/lib/syslinux/isolinux.bin                             "$BUILD_TARGET"/boot/isolinux/
-      cp /usr/lib/syslinux/memdisk                                  "$BUILD_TARGET"/boot/isolinux/
-      cp /usr/lib/syslinux/menu.c32                                 "$BUILD_TARGET"/boot/isolinux/
+      cp /boot/memtest86+.bin                                        "$BUILD_TARGET"/boot/isolinux/memtest
+      cp "$CHROOT_TARGET"/boot/initrd*                               "$BUILD_TARGET"/boot/isolinux/initrd.gz
+      cp "$CHROOT_TARGET"/boot/vmlinuz*                              "$BUILD_TARGET"/boot/isolinux/linux26
+      cp /usr/lib/syslinux/chain.c32                                 "$BUILD_TARGET"/boot/isolinux/
+      cp /usr/lib/syslinux/isolinux.bin                              "$BUILD_TARGET"/boot/isolinux/
+      cp /usr/lib/syslinux/memdisk                                   "$BUILD_TARGET"/boot/isolinux/
+      cp /usr/lib/syslinux/menu.c32                                  "$BUILD_TARGET"/boot/isolinux/
       cp /usr/share/grml-live/i386_files/boot/isolinux/allinone.img  "$BUILD_TARGET"/boot/isolinux/
       cp /usr/share/grml-live/i386_files/boot/isolinux/balder10.imz  "$BUILD_TARGET"/boot/isolinux/
       cp /usr/share/grml-live/i386_files/boot/isolinux/boot-beep.msg "$BUILD_TARGET"/boot/isolinux/
@@ -186,8 +187,12 @@ if [ "$ARCH" = i386 ] ; then
       cp /usr/share/grml-live/i386_files/boot/isolinux/isolinux.cfg  "$BUILD_TARGET"/boot/isolinux/
       cp /usr/share/grml-live/i386_files/boot/isolinux/logo.16       "$BUILD_TARGET"/boot/isolinux/
       cp /usr/share/grml-live/i386_files/boot/isolinux/syslinux.cfg  "$BUILD_TARGET"/boot/isolinux/
-      # minirt26.gz
-      # boot.cat
+      # autostart for Windows:
+      cp /usr/share/grml-live/windows/autostart/autorun.bat          "$BUILD_TARGET"/
+      cp /usr/share/grml-live/windows/autostart/autorun.inf          "$BUILD_TARGET"/
+      cp /usr/share/grml-live/windows/autostart/autorun.pif          "$BUILD_TARGET"/
+      cp /usr/share/grml-live/windows/autostart/cdrom.ico            "$BUILD_TARGET"/
+      # windows-binaries:
       if [ -n "$WINDOWS_BINARIES" ] ; then
          if [ -d "$BUILD_TARGET"/windows ] ; then
             echo "  [x] $BUILD_TARGET/windows exists already - skipping stage 'WINDOWS_BINARIES'"

diff --git a/windows/autostart/autorun.bat b/windows/autostart/autorun.bat
new file mode 100755 (executable)
index 0000000..9d603fa
--- /dev/null
+++ b/windows/autostart/autorun.bat
@@ -0,0 +1,3 @@
+@echo Loading "index.html"...\r
+@start GRML/index.html\r
+@exit\r

diff --git a/windows/autostart/autorun.inf b/windows/autostart/autorun.inf
new file mode 100755 (executable)
index 0000000..ed99086
--- /dev/null
+++ b/windows/autostart/autorun.inf
@@ -0,0 +1,3 @@
+[autorun]\r
+open=autorun.bat\r
+icon=cdrom.ico\r

diff --git a/windows/autostart/autorun.pif b/windows/autostart/autorun.pif
new file mode 100755 (executable)
index 0000000..d0201c8
Binary files /dev/null and b/windows/autostart/autorun.pif differ

diff --git a/windows/autostart/cdrom.ico b/windows/autostart/cdrom.ico
new file mode 100644 (file)
index 0000000..4da9c98
Binary files /dev/null and b/windows/autostart/cdrom.ico differ