Attachment #3363 for bug #19150

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

Lines 89-94 AC_CONFIG_FILES([ Link Here

(-)a/configure.ac (+1 lines)
89	extras/Makefile	89	extras/Makefile
90	extras/ata_id/Makefile	90	extras/ata_id/Makefile
91	extras/cdrom_id/Makefile	91	extras/cdrom_id/Makefile
		92	extras/dm_export/Makefile
92	extras/edd_id/Makefile	93	extras/edd_id/Makefile
93	extras/hotplug/Makefile	94	extras/hotplug/Makefile
94	extras/path_id/Makefile	95	extras/path_id/Makefile

Lines 3-8 include $(top_srcdir)/Makefile.am.inc Link Here

(-)a/extras/Makefile.am (+1 lines)
3	SUBDIRS = \	3	SUBDIRS = \
4	ata_id \	4	ata_id \
5	cdrom_id \	5	cdrom_id \
		6	dm_export \
6	edd_id \	7	edd_id \
7	hotplug \	8	hotplug \
8	path_id \	9	path_id \

Line 0 Link Here

(-)a/extras/dm_export/Makefile.am (+5 lines)
	1	include $(top_srcdir)/Makefile.am.inc
	2
	3	udevhomedir = $(udev_prefix)/lib/udev
	4	dist_udevhome_SCRIPTS = \
	5	dm_export




#!/bin/sh -e

major=$1
minor=$2

dm_get() {
	/sbin/dmsetup info -o $1 -c --noheadings -j$major -m$minor
}

echo "DM_NAME=$(dm_get name)"
echo "DM_UUID=$(dm_get uuid)"
echo "DM_SUSPENDED=$(dm_get suspended)"

Lines 16-22 dist_altudevrules_DATA = \ Link Here

(-)a/rules/Makefile.am (-1 / +1 lines)
16	altlinux/20-hotplug-scripts.rules \	16	altlinux/20-hotplug-scripts.rules \
17	altlinux/40-alsa.rules \	17	altlinux/40-alsa.rules \
18	packages/64-md-raid.rules \	18	packages/64-md-raid.rules \
19	suse/64-device-mapper.rules \	19	altlinux/64-device-mapper.rules \
20	altlinux/70-permissions.rules \	20	altlinux/70-permissions.rules \
21	altlinux/94-pam-console.rules	21	altlinux/94-pam-console.rules
22		22




KERNEL!="dm-*", GOTO="device_mapper_end"
ACTION!="add|change", GOTO="device_mapper_end"

IMPORT{program}="dm_export %M %m"
ENV{DM_NAME}!="?*", GOTO="device_mapper_end"

SYMLINK+="disk/by-id/dm-name-$env{DM_NAME}", OPTIONS+="string_escape=replace"
ENV{DM_UUID}=="?*", SYMLINK+="disk/by-id/dm-uuid-$env{DM_UUID}", OPTIONS+="string_escape=replace"

ENV{DM_SUSPENDED}=="Suspended", GOTO="device_mapper_end"

#FIXME
#ENV{DM_TARGET_TYPES}=="|*error*", GOTO="device_mapper_end"

IMPORT{program}="vol_id --export $tempnode"
OPTIONS+="link_priority=-100"
OPTIONS+="watch"
# FIXME
#ENV{DM_TARGET_TYPES}=="*snapshot-origin*", OPTIONS+="link_priority=-90"
ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}"

- 

Return to bug 19150

Line 0 Link Here

(-)a/extras/dm_export/dm_export (+12 lines)
	1	#!/bin/sh -e
	2
	3	major=$1
	4	minor=$2
	5
	6	dm_get() {
	7	/sbin/dmsetup info -o $1 -c --noheadings -j$major -m$minor
	8	}
	9
	10	echo "DM_NAME=$(dm_get name)"
	11	echo "DM_UUID=$(dm_get uuid)"
	12	echo "DM_SUSPENDED=$(dm_get suspended)"

Lines 5-23 KERNEL=="device-mapper", SYMLINK+="mapper/control" Link Here

(-)a/rules/altlinux/64-device-mapper.rules (-5 / +7 lines)
5	KERNEL!="dm-*", GOTO="device_mapper_end"	5	KERNEL!="dm-*", GOTO="device_mapper_end"
6	ACTION!="add\|change", GOTO="device_mapper_end"	6	ACTION!="add\|change", GOTO="device_mapper_end"
7		7
8	IMPORT{program}="/sbin/dmsetup export -j%M -m%m"	8	IMPORT{program}="dm_export %M %m"
9	ENV{DM_NAME}!="?*", GOTO="device_mapper_end"	9	ENV{DM_NAME}!="?*", GOTO="device_mapper_end"
10		10
11	SYMLINK+="disk/by-id/dm-name-$env{DM_NAME}", OPTIONS+="string_escape=replace"	11	SYMLINK+="disk/by-id/dm-name-$env{DM_NAME}", OPTIONS+="string_escape=replace"
12	ENV{DM_UUID}=="?*", SYMLINK+="disk/by-id/dm-uuid-$env{DM_UUID}", OPTIONS+="string_escape=replace"	12	ENV{DM_UUID}=="?*", SYMLINK+="disk/by-id/dm-uuid-$env{DM_UUID}", OPTIONS+="string_escape=replace"
13		13
14	ENV{DM_STATE}=="SUSPENDED", GOTO="device_mapper_end"	14	ENV{DM_SUSPENDED}=="Suspended", GOTO="device_mapper_end"
15	ENV{DM_TARGET_TYPES}=="\|error", GOTO="device_mapper_end"	15
		16	#FIXME
		17	#ENV{DM_TARGET_TYPES}=="\|error", GOTO="device_mapper_end"
16		18
17	IMPORT{program}="vol_id --export $tempnode"	19	IMPORT{program}="vol_id --export $tempnode"
18	OPTIONS+="link_priority=-100"	20	OPTIONS+="link_priority=-100"
19	OPTIONS+="watch"	21	OPTIONS+="watch"
20	ENV{DM_TARGET_TYPES}=="snapshot-origin", OPTIONS+="link_priority=-90"	22	# FIXME
		23	#ENV{DM_TARGET_TYPES}=="snapshot-origin", OPTIONS+="link_priority=-90"
21	ENV{ID_FS_USAGE}=="filesystem\|other\|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"	24	ENV{ID_FS_USAGE}=="filesystem\|other\|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
22	ENV{ID_FS_USAGE}=="filesystem\|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}"	25	ENV{ID_FS_USAGE}=="filesystem\|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}"
23		26
24	-