[dracut/f12/master] - backported a lot of bugfixes from git

Harald Hoyer harald at fedoraproject.org
Thu Sep 23 14:52:04 UTC 2010


commit c130bfc615aba369d6fd7e2a9a90a3ebab3b3b0b
Author: Harald Hoyer <harald at redhat.com>
Date:   Thu Sep 23 16:52:03 2010 +0200

    - backported a lot of bugfixes from git

 ...l-9-dhclient-if-normal-kill-does-not-succ.patch |   29 ++++++++++++++++++++
 ...-not-use-no-degraded-for-incremental-mode.patch |   25 +++++++++++++++++
 2 files changed, 54 insertions(+), 0 deletions(-)
---
diff --git a/0132-network-kill-9-dhclient-if-normal-kill-does-not-succ.patch b/0132-network-kill-9-dhclient-if-normal-kill-does-not-succ.patch
new file mode 100644
index 0000000..7376da1
--- /dev/null
+++ b/0132-network-kill-9-dhclient-if-normal-kill-does-not-succ.patch
@@ -0,0 +1,29 @@
+From 20415e1dfdc88697e0869a086fcb11fd9f4b91e7 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Thu, 23 Sep 2010 16:23:33 +0200
+Subject: [PATCH 132/133] network: kill -9 dhclient, if normal kill does not succeed
+
+https://bugzilla.redhat.com/show_bug.cgi?id=583348
+---
+ modules.d/40network/kill-dhclient.sh |    8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/modules.d/40network/kill-dhclient.sh b/modules.d/40network/kill-dhclient.sh
+index 54b3344..fb74385 100755
+--- a/modules.d/40network/kill-dhclient.sh
++++ b/modules.d/40network/kill-dhclient.sh
+@@ -5,3 +5,11 @@ for f in /tmp/dhclient.*.pid; do
+     read PID < $f;
+     kill $PID;
+ done
++
++sleep 0.1
++
++for f in /tmp/dhclient.*.pid; do
++    [ -e $f ] || continue
++    read PID < $f;
++    kill -9 $PID;
++done
+-- 
+1.7.3
+
diff --git a/0133-md-do-not-use-no-degraded-for-incremental-mode.patch b/0133-md-do-not-use-no-degraded-for-incremental-mode.patch
new file mode 100644
index 0000000..6eb5a74
--- /dev/null
+++ b/0133-md-do-not-use-no-degraded-for-incremental-mode.patch
@@ -0,0 +1,25 @@
+From d5e7a9520cdcd7353c763386f35c30769a429096 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Thu, 23 Sep 2010 16:25:35 +0200
+Subject: [PATCH 133/133] md: do not use --no-degraded for incremental mode
+
+---
+ modules.d/90mdraid/65-md-incremental-imsm.rules |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/modules.d/90mdraid/65-md-incremental-imsm.rules b/modules.d/90mdraid/65-md-incremental-imsm.rules
+index 93715f5..57db798 100644
+--- a/modules.d/90mdraid/65-md-incremental-imsm.rules
++++ b/modules.d/90mdraid/65-md-incremental-imsm.rules
+@@ -37,7 +37,7 @@ LABEL="md_auto_end"
+ #
+ # Incrementally build the md array
+ #
+-RUN+="/sbin/mdadm -I --no-degraded $env{DEVNAME}"
++RUN+="/sbin/mdadm -I $env{DEVNAME}"
+ 
+ RUN+="/bin/ln -s /sbin/md_finished.sh /initqueue-finished/md_finished.sh"
+ 
+-- 
+1.7.3
+


More information about the scm-commits mailing list