Attachment #327890 for bug #437700




# Also don't process disks that are slated to be a multipath device
ENV{DM_MULTIPATH_DEVICE_PATH}=="?*", GOTO="ps_end"

KERNEL=="cciss[0-9]*", IMPORT BLKID
KERNEL=="nbd[0-9]*", IMPORT BLKID


KERNEL!="md[0-9]*|md_d[0-9]*|md/*", KERNEL!="md*", GOTO="md_end"

LABEL="md_ignore_state"

IMPORT{program}="/sbin/mdadm --detail --export $tempnode"
IMPORT BLKID
OPTIONS+="link_priority=100"
OPTIONS+="watch"
LABEL="md_end"

ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", GOTO="ps_end"
ENV{DM_UUID}=="CRYPT-TEMP-?*", GOTO="ps_end"
ENV{DM_UUID}!="?*", ENV{DM_NAME}=="temporary-cryptsetup-?*", GOTO="ps_end"
IMPORT BLKID


LABEL="ps_end"

Lines 12-18 Link Here

(-)dracut-024.orig/modules.d/95udev-rules/61-persistent-storage.rules (-1 / +1 lines)
12		12
13	LABEL="do_pss"	13	LABEL="do_pss"
14	# by-path (parent device path)	14	# by-path (parent device path)
15	ENV{DEVTYPE}=="disk", ENV{ID_PATH}=="", DEVPATH!="/virtual/", IMPORT{builtin}="path_id"	15	ENV{DEVTYPE}=="disk", ENV{ID_PATH}=="", DEVPATH!="/virtual/", IMPORT PATH_ID
16	ENV{DEVTYPE}=="disk", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}"	16	ENV{DEVTYPE}=="disk", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}"
17	ENV{DEVTYPE}=="partition", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}-part%n"	17	ENV{DEVTYPE}=="partition", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}-part%n"
18		18

Lines 74-78 Link Here

(-)dracut-024.orig/modules.d/95udev-rules/module-setup.sh (+2 lines)
74	inst_script "$moddir/load-modules.sh" /lib/udev/load-modules.sh	74	inst_script "$moddir/load-modules.sh" /lib/udev/load-modules.sh
75		75
76	inst_libdir_file "libnss_files*"	76	inst_libdir_file "libnss_files*"
		77
		78	inst_hook pre-udev 10 "$moddir/udev-rules-prepare.sh"
77	}	79	}
78		80




#!/bin/sh
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
# ex: ts=8 sw=4 sts=4 et filetype=sh

for f in /etc/udev/rules.d/*-persistent-storage.rules; do
    [ -e "$f" ] || continue
    while read line; do
        if [ "${line%%IMPORT PATH_ID}" != "$line" ]; then
            if [ $UDEVVERSION -ge 174 ]; then
                printf '%sIMPORT{builtin}="path_id"\n' "${line%%IMPORT PATH_ID}"
            else
                printf '%sIMPORT{program}="path_id %%p"\n' "${line%%IMPORT PATH_ID}"
            fi
        elif [ "${line%%IMPORT BLKID}" != "$line" ]; then
            if [ $UDEVVERSION -ge 176 ]; then
                printf '%sIMPORT{builtin}="blkid"\n' "${line%%IMPORT BLKID}"
            else
                printf '%sIMPORT{program}="/sbin/blkid -o udev -p $tempnode"\n' "${line%%IMPORT BLKID}"
            fi
        else
            echo "$line"
        fi
    done < "${f}" > "${f}.new"
    mv "${f}.new" "$f"
done

Lines 83-89 Link Here

(-)dracut-024.orig/modules.d/99base/init.sh (-1 / +1 lines)
83		83
84	[ -d /run/initramfs ] \|\| mkdir -p -m 0755 /run/initramfs	84	[ -d /run/initramfs ] \|\| mkdir -p -m 0755 /run/initramfs
85		85
86	UDEVVERSION=$(udevadm --version)	86	export UDEVVERSION=$(udevadm --version)
87	if [ $UDEVVERSION -gt 166 ]; then	87	if [ $UDEVVERSION -gt 166 ]; then
88	# newer versions of udev use /run/udev/rules.d	88	# newer versions of udev use /run/udev/rules.d
89	export UDEVRULESD=/run/udev/rules.d	89	export UDEVRULESD=/run/udev/rules.d

Return to bug 437700

Lines 3-10 Link Here

(-)dracut-024.orig/modules.d/95udev-rules/59-persistent-storage.rules (-4 / +4 lines)
3	# Also don't process disks that are slated to be a multipath device	3	# Also don't process disks that are slated to be a multipath device
4	ENV{DM_MULTIPATH_DEVICE_PATH}=="?*", GOTO="ps_end"	4	ENV{DM_MULTIPATH_DEVICE_PATH}=="?*", GOTO="ps_end"
5		5
6	KERNEL=="cciss[0-9]*", IMPORT{builtin}="blkid"	6	KERNEL=="cciss[0-9]*", IMPORT BLKID
7	KERNEL=="nbd[0-9]*", IMPORT{builtin}="blkid"	7	KERNEL=="nbd[0-9]*", IMPORT BLKID
8		8
9		9
10	KERNEL!="md[0-9]\|md_d[0-9]\|md/", KERNEL!="md", GOTO="md_end"	10	KERNEL!="md[0-9]\|md_d[0-9]\|md/", KERNEL!="md", GOTO="md_end"
Lines 21-27 Link Here
21	LABEL="md_ignore_state"	21	LABEL="md_ignore_state"
22		22
23	IMPORT{program}="/sbin/mdadm --detail --export $tempnode"	23	IMPORT{program}="/sbin/mdadm --detail --export $tempnode"
24	IMPORT{builtin}="blkid"	24	IMPORT BLKID
25	OPTIONS+="link_priority=100"	25	OPTIONS+="link_priority=100"
26	OPTIONS+="watch"	26	OPTIONS+="watch"
27	LABEL="md_end"	27	LABEL="md_end"
Lines 34-40 Link Here
34	ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", GOTO="ps_end"	34	ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", GOTO="ps_end"
35	ENV{DM_UUID}=="CRYPT-TEMP-?*", GOTO="ps_end"	35	ENV{DM_UUID}=="CRYPT-TEMP-?*", GOTO="ps_end"
36	ENV{DM_UUID}!="?", ENV{DM_NAME}=="temporary-cryptsetup-?", GOTO="ps_end"	36	ENV{DM_UUID}!="?", ENV{DM_NAME}=="temporary-cryptsetup-?", GOTO="ps_end"
37	IMPORT{builtin}="blkid"	37	IMPORT BLKID
38		38
39		39
40	LABEL="ps_end"	40	LABEL="ps_end"

Line 0 Link Here

(-)dracut-024.orig/modules.d/95udev-rules/udev-rules-prepare.sh (+25 lines)
	1	#!/bin/sh
	2	# -- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; --
	3	# ex: ts=8 sw=4 sts=4 et filetype=sh
	4
	5	for f in /etc/udev/rules.d/*-persistent-storage.rules; do
	6	[ -e "$f" ] \|\| continue
	7	while read line; do
	8	if [ "${line%%IMPORT PATH_ID}" != "$line" ]; then
	9	if [ $UDEVVERSION -ge 174 ]; then
	10	printf '%sIMPORT{builtin}="path_id"\n' "${line%%IMPORT PATH_ID}"
	11	else
	12	printf '%sIMPORT{program}="path_id %%p"\n' "${line%%IMPORT PATH_ID}"
	13	fi
	14	elif [ "${line%%IMPORT BLKID}" != "$line" ]; then
	15	if [ $UDEVVERSION -ge 176 ]; then
	16	printf '%sIMPORT{builtin}="blkid"\n' "${line%%IMPORT BLKID}"
	17	else
	18	printf '%sIMPORT{program}="/sbin/blkid -o udev -p $tempnode"\n' "${line%%IMPORT BLKID}"
	19	fi
	20	else
	21	echo "$line"
	22	fi
	23	done < "${f}" > "${f}.new"
	24	mv "${f}.new" "$f"
	25	done