Ovirt devel - Sep 2009 - [PATCH node] adjust init script patching for local boot on F11

mkliveinitrd dropped udev trigger, and it already appends || :
---
 scripts/ovirt-config-boot |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/scripts/ovirt-config-boot b/scripts/ovirt-config-boot
index a40c03a..2961f76 100755
--- a/scripts/ovirt-config-boot
+++ b/scripts/ovirt-config-boot
@@ -107,7 +107,7 @@ ovirt_boot_setup() {
         # Fedora 10 mkliveinitrd
         init_script=sbin/real-init
     fi
-    sed -i '/^\/sbin\/udev.*settle/ a \
+    sed -i '/^\/sbin\/udev.*trigger/ a \
 echo SCSI wait for scans\
 /sbin/modprobe scsi_wait_scan\
 /sbin/modprobe -r scsi_wait_scan\
@@ -125,8 +125,6 @@ set -e\
 ' $init_script
     # fix emergency shell
     sed -i 's/^    bash$/    bash < \/dev\/console/' $init_script
-    # do not fail if device node already exists
-    sed -i 's/mknod.*$/& || :/' $init_script
     mkdir -p bin
     bit     if [ -e /lib64 ]; then
-- 
1.6.0.6

mkliveinitrd dropped udev settle
and it already appends || : to avoid non-fatal errors

Signed-off-by: Alan Pevec <apevec at redhat.com>
---
 scripts/ovirt-config-boot |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/scripts/ovirt-config-boot b/scripts/ovirt-config-boot
index a40c03a..2961f76 100755
--- a/scripts/ovirt-config-boot
+++ b/scripts/ovirt-config-boot
@@ -107,7 +107,7 @@ ovirt_boot_setup() {
         # Fedora 10 mkliveinitrd
         init_script=sbin/real-init
     fi
-    sed -i '/^\/sbin\/udev.*settle/ a \
+    sed -i '/^\/sbin\/udev.*trigger/ a \
 echo SCSI wait for scans\
 /sbin/modprobe scsi_wait_scan\
 /sbin/modprobe -r scsi_wait_scan\
@@ -125,8 +125,6 @@ set -e\
 ' $init_script
     # fix emergency shell
     sed -i 's/^    bash$/    bash < \/dev\/console/' $init_script
-    # do not fail if device node already exists
-    sed -i 's/mknod.*$/& || :/' $init_script
     mkdir -p bin
     bit     if [ -e /lib64 ]; then
-- 
1.6.0.6