File 0029-95fcoe-start-lldpad-separately.patch of Package dracut

Overview Repositories Revisions Requests Users Attributes Meta

File 0029-95fcoe-start-lldpad-separately.patch of Package dracut (Revision 84b2812cb910ee8824c65fe0ae20a9bd)

Currently displaying revision 84b2812cb910ee8824c65fe0ae20a9bd , Show latest

From f7c7657cafc12cf9ab03c6ff84c05b09c8f9bdd1 Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <hare@suse.de>
Date: Wed, 14 May 2014 08:04:22 +0200
Subject: 95fcoe: start lldpad separately

lldpad is a system-wide process, which must be started only once.
So we should be separate it from fcoe-up, as it might be called
several times.

Signed-off-by: Hannes Reinecke <hare@suse.de>
---
 modules.d/95fcoe/fcoe-up.sh      |  8 --------
 modules.d/95fcoe/lldpad.sh       | 15 +++++++++++++++
 modules.d/95fcoe/module-setup.sh |  1 +
 3 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 modules.d/95fcoe/lldpad.sh

Index: dracut-037/modules.d/95fcoe/fcoe-up.sh
===================================================================
--- dracut-037.orig/modules.d/95fcoe/fcoe-up.sh
+++ dracut-037/modules.d/95fcoe/fcoe-up.sh
@@ -24,10 +24,6 @@ netdriver=$(readlink -f /sys/class/net/$
 netdriver=${netdriver##*/}
 
 if [ "$dcb" = "dcb" ]; then
-    # Note lldpad will stay running after switchroot, the system initscripts
-    # are to kill it and start a new lldpad to take over. Data is transfered
-    # between the 2 using a shm segment
-    lldpad -d
     # wait for lldpad to be ready
     i=0
     while [ $i -lt 60 ]; do
@@ -37,10 +33,6 @@ if [ "$dcb" = "dcb" ]; then
         i=$(($i+1))
     done
 
-    # on some systems lldpad needs some time
-    # sleep until we find a better solution
-    sleep 30
-
     while [ $i -lt 60 ]; do
         dcbtool sc "$netif" dcb on && break
         info "Retrying to turn dcb on"
Index: dracut-037/modules.d/95fcoe/lldpad.sh
===================================================================
--- /dev/null
+++ dracut-037/modules.d/95fcoe/lldpad.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# Note lldpad will stay running after switchroot, the system initscripts
+# are to kill it and start a new lldpad to take over. Data is transfered
+# between the 2 using a shm segment
+lldpad -d
+# wait for lldpad to be ready
+i=0
+while [ $i -lt 60 ]; do
+    lldptool -p && break
+    info "Waiting for lldpad to be ready"
+    sleep 1
+    i=$(($i+1))
+done
+
Index: dracut-037/modules.d/95fcoe/module-setup.sh
===================================================================
--- dracut-037.orig/modules.d/95fcoe/module-setup.sh
+++ dracut-037/modules.d/95fcoe/module-setup.sh
@@ -71,6 +71,7 @@ install() {
     inst "$moddir/fcoe-up.sh" "/sbin/fcoe-up"
     inst "$moddir/fcoe-edd.sh" "/sbin/fcoe-edd"
     inst "$moddir/fcoe-genrules.sh" "/sbin/fcoe-genrules.sh"
+    inst_hook pre-trigger 03 "$moddir/lldpad.sh"
     inst_hook cmdline 99 "$moddir/parse-fcoe.sh"
     dracut_need_initqueue
 }
Index: dracut-037/mkinitrd-suse.8.asc
===================================================================
--- dracut-037.orig/mkinitrd-suse.8.asc
+++ dracut-037/mkinitrd-suse.8.asc
@@ -61,11 +61,6 @@ OPTIONS
 **-I** _<interface>::
     Configure the specified interface statically.
 
-**-a** _<acpi_dsdt>::
-    Attach compiled ACPI DSDT (Differentiated System Description Table)
-    to initrd. This replaces the DSDT of the BIOS. Defaults to the
-    _ACPI_DSDT_ variable in */etc/sysconfig/kernel*.
-
 **-M** _<map>::
     System.map file to use.
 
@@ -87,9 +82,6 @@ OPTIONS
     Disable logging to _/var/log/YaST2/mkinitrd.log_. This is useful for
     testing if you don’t want to clutter the system log.
 
-**--force**::
-    overwrite existing initramfs file.
-
 **--help**::
     print a help message and exit.
 
Index: dracut-037/mkinitrd-suse.8
===================================================================
--- dracut-037.orig/mkinitrd-suse.8
+++ dracut-037/mkinitrd-suse.8
@@ -117,14 +117,6 @@ Run dhcp on the specified interface (for
 Configure the specified interface statically\&.
 .RE
 .PP
-\fB\-a\fR\ \&_<acpi_dsdt>
-.RS 4
-Attach compiled ACPI DSDT (Differentiated System Description Table) to initrd\&. This replaces the DSDT of the BIOS\&. Defaults to the
-\fIACPI_DSDT\fR
-variable in
-\fB/etc/sysconfig/kernel\fR\&.
-.RE
-.PP
 \fB\-M\fR\ \&_<map>
 .RS 4
 System\&.map file to use\&.

Places

File 0029-95fcoe-start-lldpad-separately.patch of Package dracut (Revision 84b2812cb910ee8824c65fe0ae20a9bd)

Places