Attachment #1493 for bug #7369

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

Line 0 Link Here

(-)a/SOURCES/dm_helper (+5 lines)
	1	#!/bin/sh
	2	dminfo=$(/sbin/dmsetup info -c --noopencount --noheadings -j $1 -m $2)
	3	echo DM_NAME=$(echo $dminfo \| cut -d: -f 1)
	4	echo DM_ID=$(echo $dminfo \| cut -d: -f 8 )
	5	echo DM_NAME_LVM=$(echo $dminfo \| cut -d: -f 1 \| sed 's,-,/,g' \| sed 's,//,-,g')

Lines 45-50 KERNEL=="*[!0-9]", IMPORT{program}="edd_ Link Here

(-)a/udev-rules/60-persistent-storage.rules (-1 / +3 lines)
45	KERNEL=="[!0-9]", ENV{ID_EDD}=="?", SYMLINK+="disk/by-id/edd-$env{ID_EDD}"	45	KERNEL=="[!0-9]", ENV{ID_EDD}=="?", SYMLINK+="disk/by-id/edd-$env{ID_EDD}"
46	KERNEL=="[0-9]", ENV{ID_EDD}=="?", SYMLINK+="disk/by-id/edd-$env{ID_EDD}-part%n"	46	KERNEL=="[0-9]", ENV{ID_EDD}=="?", SYMLINK+="disk/by-id/edd-$env{ID_EDD}-part%n"
47		47
48	KERNEL=="dm-[0-9]*", ACTION=="add", PROGRAM="/sbin/dmsetup info -c --noopencount --noheadings -o name -j %M -m %m", SYMLINK="disk/by-name/%c"	48	KERNEL=="dm-[0-9]*", IMPORT{program}="dm_helper %M %m"
		49	KERNEL=="dm-[0-9]*", SYMLINK+="disk/by-name/$env{DM_NAME}"
		50	KERNEL=="dm-[0-9]", ENV{DM_ID}=="LVM?", SYMLINK+="$env{DM_NAME_LVM}"
49		51
50	LABEL="persistent_storage_end"	52	LABEL="persistent_storage_end"




Source0: %name-%version.tar
Source1:	%name-rules-%version-%release.tar
Source5:	udev.dvb-scripts.bz2
Source6:	dm_helper
Source14:       udevd.init

Patch1:		udev-088-create-floppy.patch

Patch3:		udev-091-uevent_seqnum-create.patch

Requires:	udev_static-addon
Requires:	dmsetup
Conflicts:	linux-hotplug

%description

    %make udevdir=/dev EXTRAS=$i DESTDIR=%buildroot libdir=/%_lib usrlibdir=%_libdir install
done

install -m 0755 %SOURCE6 %buildroot/%_lib/udev/

%__rm -f %buildroot%_sysconfdir/udev/udev.permissions
%__rm -f %buildroot%_sysconfdir/udev/udev.rules.devfs

Return to bug 7369

Lines 37-42 BuildRequires: libsysfs-devel > 0.4.0-al Link Here

(-)a/udev.spec (+3 lines)
37	Source0: %name-%version.tar	37	Source0: %name-%version.tar
38	Source1: %name-rules-%version-%release.tar	38	Source1: %name-rules-%version-%release.tar
39	Source5: udev.dvb-scripts.bz2	39	Source5: udev.dvb-scripts.bz2
		40	Source6: dm_helper
40	Source14: udevd.init	41	Source14: udevd.init
41		42
42	Patch1: udev-088-create-floppy.patch	43	Patch1: udev-088-create-floppy.patch
Lines 44-49 Patch2: udev-0.46-alt-compile_warnings. Link Here
44	Patch3: udev-091-uevent_seqnum-create.patch	45	Patch3: udev-091-uevent_seqnum-create.patch
45		46
46	Requires: udev_static-addon	47	Requires: udev_static-addon
		48	Requires: dmsetup
47	Conflicts: linux-hotplug	49	Conflicts: linux-hotplug
48		50
49	%description	51	%description
Lines 132-137 for i in extras/path_id extras/floppy ex Link Here
132	%make udevdir=/dev EXTRAS=$i DESTDIR=%buildroot libdir=/%_lib usrlibdir=%_libdir install	134	%make udevdir=/dev EXTRAS=$i DESTDIR=%buildroot libdir=/%_lib usrlibdir=%_libdir install
133	done	135	done
134		136
		137	install -m 0755 %SOURCE6 %buildroot/%_lib/udev/
135		138
136	%__rm -f %buildroot%_sysconfdir/udev/udev.permissions	139	%__rm -f %buildroot%_sysconfdir/udev/udev.permissions
137	%__rm -f %buildroot%_sysconfdir/udev/udev.rules.devfs	140	%__rm -f %buildroot%_sysconfdir/udev/udev.rules.devfs