--- mount-hal-fs.orig 2008-12-04 12:03:12 +0300 +++ mount-hal-fs 2008-12-04 11:49:53 +0300 @@ -45,6 +45,16 @@ exit fi + if [ "$IGNORE_FSTAB_ENTRIES" == "yes" ] && [ -n "${HAL_PROP_VOLUME_UUID}" ] && grep -E "^[Uu][Uu][Ii][Dd]=${HAL_PROP_VOLUME_UUID}[[:blank:]]" /etc/fstab >/dev/null; then + initlog -n $LOG_NAME -s "$HAL_PROP_BLOCK_DEVICE with UUID=${HAL_PROP_VOLUME_UUID} exist in /etc/fstab, will not be mounted." + exit + fi + + if [ "$IGNORE_FSTAB_ENTRIES" == "yes" ] && [ -n "${HAL_PROP_VOLUME_LABEL}" ] && grep -E "^[Uu][Uu][Ii][Dd]=${HAL_PROP_VOLUME_UUID}[[:blank:]]" /etc/fstab >/dev/null; then + initlog -n $LOG_NAME -s "$HAL_PROP_BLOCK_DEVICE with LABEL=${HAL_PROP_VOLUME_LABEL} exist in /etc/fstab, will not be mounted." + exit + fi + OBLIGATORY_MOUNT_OPTIONS="nodev,nosuid,noexec,noatime" if [ "$HAL_PROP_INFO_CATEGORY" == "storage" ]; then