X-Git-Url: https://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=grml2usb;h=5e37a675de3530ed7c75fcc70cd014b6e0435dc4;hp=3f5889b4189a44134ce3212f54858bee8f533110;hb=691a25a0c38dc62ba2c64c93a05a290d7ed26b57;hpb=12aff0e9cd8510922d3e9393f431efb6e57342ff

diff --git a/grml2usb b/grml2usb
index 3f5889b..5e37a67 100755
--- a/grml2usb
+++ b/grml2usb
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Sat Feb 23 23:43:52 CET 2008 [mika]
+# Latest change: Sun May 25 01:37:43 CEST 2008 [mika]
 ################################################################################
 
 # colors {{{
@@ -49,7 +49,7 @@
   LANGUAGE='C'
   LC_ALL='C'
   PROGRAMNAME=${0##*/}
-  VERSION='0.9.0'
+  VERSION='0.9.1'
   ISO="$1"
   DEVICE="$2"
 
@@ -110,7 +110,7 @@ info(){
 
 vfat_warning(){
   DEV=$(echo ${DEVICE%/})
-  TMPDEV=$(grep ${DEV} /etc/fstab | awk '{print $1}')
+  TMPDEV=$(grep "[[:space:]]${DEV}[[:space:]]" /etc/fstab | grep -vh '^[[:space:]]*#' | awk '{print $1}')
   SYSDEV=$(echo ${TMPDEV%/})
   if [ -x /lib/udev/vol_id ] ; then
      /lib/udev/vol_id $SYSDEV | grep -q 'FS_TYPE=vfat' || VFAT=1
@@ -182,6 +182,9 @@ copyit(){
     fi
     echo boot >> $DEVICE/grml2usb.filelist
 
+    # syslinux creates a file named ldlinux.sys:
+    echo "ldlinux.sys" >> ${DEVICE}/grml2usb.filelist
+
     if ! [ -r ${DEVICE}/live/filesystem.module ] ; then
        GRML_NAME=grml
     else
@@ -224,7 +227,7 @@ copyit(){
 
 run_syslinux(){
   DEV=$(echo ${DEVICE%/})
-  TMPDEV=$(grep ${DEV} /etc/fstab | awk '{print $1}')
+  TMPDEV=$(grep "[[:space:]]${DEV}[[:space:]]" /etc/fstab | grep -vh '^[[:space:]]*#' | awk '{print $1}')
   SYSDEV=$(echo ${TMPDEV%/})
   echo -n "Running syslinux on ${SYSDEV}: "
   debugit "debug: syslinux ${SYSDEV}"