Changeset 3026


Ignore:
Timestamp:
Jul 3, 2012, 8:00:08 PM (7 years ago)
Author:
bruno
Message:

r4936@localhost: bruno | 2012-07-03 18:26:03 +0200

  • Fix #621 by avoiding to handle iso9660 FS type from fstab as well as bind mounted FS.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/3.0/mindi/mindi

    r3024 r3026  
    10701070    [ "$IMAGE_DEVS" != "" ] && all_partitions="`echo "$all_partitions $IMAGE_DEVS" | tr ' ' '\n' | sort -u | tr '\n ' ' '`"
    10711071    printf "        %-15s %-15s %-15s %-13s %-15s\n" DEVICE MOUNTPOINT FORMAT "SIZE (MB)" LABEL/UUID | tee -a $LOGFILE
    1072     useless_dev="/dev/floppy /dev/fd0h1440 /dev/fd0H1440 /dev/cdrom /dev/cdrom/cdrom /dev/cdrom/cdrom1 /dev/cdrom/cdrom2 /dev/cdrom0 /dev/cdrom1 /dev/cdrom2 /dev/cdrom3 /dev/cdrw /dev/scd /dev/ram :/ /dev/sr0 /dev/sr1 /dev/cdrom1 tmpfs devpts sysfs proc debugfs"
     1072    useless_dev="/dev/floppy /dev/fd0h1440 /dev/fd0H1440 /dev/cdrom /dev/cdrom/cdrom /dev/cdrom/cdrom1 /dev/cdrom/cdrom2 /dev/cdrom0 /dev/cdrom1 /dev/cdrom2 /dev/cdrom3 /dev/cdrw /dev/scd /dev/ram :/ /dev/sr0 /dev/sr1 /dev/cdrom1 tmpfs devpts sysfs proc debugfs iso9660"
    10731073    for c_p in $all_partitions ; do
    10741074        # Skip fd/cd devices, network FS, cifs
     
    10921092        partition_option=`tr -s '\t' ' ' < $MY_FSTAB | grep -w "$current_partition" | grep -vx " *#.*" | $AWK '{print $4}' | head -n1`
    10931093        if [ "`echo "$partition_option" | grep -i noauto`" != "" ] && [ "`mount | grep -w "$partition_mountpt"`" =  "" ] ; then
     1094                LogFile "INFO: Excluding $current_partition from mountlist (due to noauto option in fstab)"
     1095            continue
     1096        fi
     1097        # Detects bind partitions and exclude them
     1098        if [ "`echo "$partition_option" | grep -iw bind`" != "" ]; then
     1099                LogFile "INFO: Excluding $current_partition from mountlist (due to bind option in fstab)"
    10941100            continue
    10951101        fi
Note: See TracChangeset for help on using the changeset viewer.