Attachment #3111 for bug #18095

View | Details | Raw Unified | Return to bug 18095
Collapse All | Expand All




		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

Return to bug 18095

Lines 45-50 Link Here

(-)mount-hal-fs.orig (+10 lines)
45	exit	45	exit
46	fi	46	fi
47		47
		48	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
		49	initlog -n $LOG_NAME -s "$HAL_PROP_BLOCK_DEVICE with UUID=${HAL_PROP_VOLUME_UUID} exist in /etc/fstab, will not be mounted."
		50	exit
		51	fi
		52
		53	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
		54	initlog -n $LOG_NAME -s "$HAL_PROP_BLOCK_DEVICE with LABEL=${HAL_PROP_VOLUME_LABEL} exist in /etc/fstab, will not be mounted."
		55	exit
		56	fi
		57
48	OBLIGATORY_MOUNT_OPTIONS="nodev,nosuid,noexec,noatime"	58	OBLIGATORY_MOUNT_OPTIONS="nodev,nosuid,noexec,noatime"
49		59
50	if [ "$HAL_PROP_INFO_CATEGORY" == "storage" ]; then	60	if [ "$HAL_PROP_INFO_CATEGORY" == "storage" ]; then