Attachment 466382 Details for Bug 731457

[patch] udev rule and sane udev exit

kiwi.patch (text/plain), 2.56 KB, created by Marcus Schaefer on 2011-12-07 20:39:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcus Schaefer

Created: 2011-12-07 20:39:45 UTC

Size: 2.56 KB

patch

obsolete

>diff --git a/modules/KIWILinuxRC.sh b/modules/KIWILinuxRC.sh
>index 2a41cbf..56ef38e 100644
>--- a/modules/KIWILinuxRC.sh
>+++ b/modules/KIWILinuxRC.sh
>@@ -610,6 +610,10 @@ function udevSystemStop {
> 	# /.../
> 	# stop udev while in pre-init phase.
> 	# ----
>+	if [ -x /sbin/udevadm ];then
>+		udevadm control --exit &>/dev/null
>+		udevadm info --cleanup-db &>/dev/null
>+	fi
> 	/etc/init.d/boot.udev stop
> 	echo
> }
>@@ -678,7 +682,15 @@ function loadAGPModules {
> # udevKill
> #--------------------------------------
> function udevKill {
>-	. /iprocs ; kill $UDEVD_PID
>+	. /iprocs
>+	if [ -x /sbin/udevadm ];then
>+		udevadm control --exit &>/dev/null
>+		udevadm info --cleanup-db &>/dev/null
>+	fi
>+	sleep 2
>+	if kill -0 $UDEVD_PID &>/dev/null;then
>+		kill $UDEVD_PID
>+	fi
> }
> #======================================
> # startSplashy
>diff --git a/system/boot/ix86/isoboot/suse-12.1/root/etc/udev/rules.d/11-dm.rules b/system/boot/ix86/isoboot/suse-12.1/root/etc/udev/rules.d/11-dm.rules
>new file mode 100644
>index 0000000..89941c4
>--- /dev/null
>+++ b/system/boot/ix86/isoboot/suse-12.1/root/etc/udev/rules.d/11-dm.rules
>@@ -0,0 +1,5 @@
>+SUBSYSTEM!="block", GOTO="dm_end"
>+KERNEL!="dm-[0-9]*", GOTO="dm_end"
>+ACTION!="add|change", GOTO="dm_end"
>+OPTIONS+="db_persist"
>+LABEL="dm_end"
>diff --git a/system/boot/ix86/netboot/suse-12.1/root/etc/udev/rules.d/11-dm.rules b/system/boot/ix86/netboot/suse-12.1/root/etc/udev/rules.d/11-dm.rules
>new file mode 100644
>index 0000000..89941c4
>--- /dev/null
>+++ b/system/boot/ix86/netboot/suse-12.1/root/etc/udev/rules.d/11-dm.rules
>@@ -0,0 +1,5 @@
>+SUBSYSTEM!="block", GOTO="dm_end"
>+KERNEL!="dm-[0-9]*", GOTO="dm_end"
>+ACTION!="add|change", GOTO="dm_end"
>+OPTIONS+="db_persist"
>+LABEL="dm_end"
>diff --git a/system/boot/ix86/oemboot/suse-12.1/root/etc/udev/rules.d/11-dm.rules b/system/boot/ix86/oemboot/suse-12.1/root/etc/udev/rules.d/11-dm.rules
>new file mode 100644
>index 0000000..89941c4
>--- /dev/null
>+++ b/system/boot/ix86/oemboot/suse-12.1/root/etc/udev/rules.d/11-dm.rules
>@@ -0,0 +1,5 @@
>+SUBSYSTEM!="block", GOTO="dm_end"
>+KERNEL!="dm-[0-9]*", GOTO="dm_end"
>+ACTION!="add|change", GOTO="dm_end"
>+OPTIONS+="db_persist"
>+LABEL="dm_end"
>diff --git a/system/boot/ix86/vmxboot/suse-12.1/root/etc/udev/rules.d/11-dm.rules b/system/boot/ix86/vmxboot/suse-12.1/root/etc/udev/rules.d/11-dm.rules
>new file mode 100644
>index 0000000..89941c4
>--- /dev/null
>+++ b/system/boot/ix86/vmxboot/suse-12.1/root/etc/udev/rules.d/11-dm.rules
>@@ -0,0 +1,5 @@
>+SUBSYSTEM!="block", GOTO="dm_end"
>+KERNEL!="dm-[0-9]*", GOTO="dm_end"
>+ACTION!="add|change", GOTO="dm_end"
>+OPTIONS+="db_persist"
>+LABEL="dm_end"

Actions: View | Diff

Attachments on bug 731457: 462985 | 466382