bb76751d8a
- Rediff patches to match git repository
- 95fcoe: Check for FCoE devices prior to binaries
* Modify 0055-95fcoe-Only-install-fcoe-module-if-required.patch
- 99base: Install chown instead of chgrp
* Modify 0052-99base-Add-chown-binary.patch
- 95iscsi: do not try to detect iSCSI firmware during booting;
should be handled via commandline parameter
* Modify 0030-95iscsi-Autodetect-iSCSI-firmware.patch
- Rename patch:
* old: 0051-mkinitrd-suse-add-update-booloader-message.patch
new: 0051-mkinitrd-suse-add-update-bootloader-message.patch
OBS-URL: https://build.opensuse.org/request/show/236229
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=157
81 lines
2.3 KiB
Diff
81 lines
2.3 KiB
Diff
From 2a0e23ad75de80c7cc280b005e2cd5f4a67a31de Mon Sep 17 00:00:00 2001
|
|
From: Hannes Reinecke <hare@suse.de>
|
|
Date: Tue, 13 May 2014 09:05:38 +0200
|
|
Subject: [PATCH] 95fcoe: Store current configuration in dracut cmdline
|
|
|
|
When running with --hostonly-cmdline we should be storing
|
|
the current configuration in /etc/cmdline.d so that dracut
|
|
will be configure the system automatically.
|
|
|
|
References: bnc#877288
|
|
|
|
Signed-off-by: Hannes Reinecke <hare@suse.de>
|
|
---
|
|
modules.d/95fcoe/module-setup.sh | 43 ++++++++++++++++++++++++++++++++++++++++
|
|
1 file changed, 43 insertions(+)
|
|
|
|
diff --git a/modules.d/95fcoe/module-setup.sh b/modules.d/95fcoe/module-setup.sh
|
|
index 9a52c00..ef4a38f 100755
|
|
--- a/modules.d/95fcoe/module-setup.sh
|
|
+++ b/modules.d/95fcoe/module-setup.sh
|
|
@@ -2,6 +2,45 @@
|
|
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
|
|
# ex: ts=8 sw=4 sts=4 et filetype=sh
|
|
|
|
+get_vlan_parent() {
|
|
+ local link=$1
|
|
+
|
|
+ [ -d $link ] || return
|
|
+ read iflink < $link/iflink
|
|
+ for if in /sys/class/net/* ; do
|
|
+ read idx < $if/ifindex
|
|
+ if [ $idx -eq $iflink ] ; then
|
|
+ echo ${if##*/}
|
|
+ fi
|
|
+ done
|
|
+}
|
|
+
|
|
+# called by dracut
|
|
+cmdline() {
|
|
+
|
|
+ for c in /sys/bus/fcoe/devices/ctlr_* ; do
|
|
+ [ -L $c ] || continue
|
|
+ read enabled < $c/enabled
|
|
+ [ $enabled -eq 0 ] && continue
|
|
+ d=$(cd -P $c; echo $PWD)
|
|
+ i=${d%/*}
|
|
+ read mac < ${i}/address
|
|
+ s=$(dcbtool gc ${i##*/} dcb | sed -n 's/^DCB State:\t*\(.*\)/\1/p')
|
|
+ if [ -z "$s" ] ; then
|
|
+ p=$(get_vlan_parent ${i})
|
|
+ if [ "$p" ] ; then
|
|
+ s=$(dcbtool gc ${p} dcb | sed -n 's/^DCB State:\t*\(.*\)/\1/p')
|
|
+ fi
|
|
+ fi
|
|
+ if [ "$s" = "on" ] ; then
|
|
+ dcb="dcb"
|
|
+ else
|
|
+ dcb="nodcb"
|
|
+ fi
|
|
+ echo "fcoe=${mac}:${dcb}"
|
|
+ done
|
|
+}
|
|
+
|
|
# called by dracut
|
|
check() {
|
|
require_binaries dcbtool fipvlan lldpad ip readlink || return 1
|
|
@@ -25,6 +64,10 @@ install() {
|
|
|
|
mkdir -m 0755 -p "$initdir/var/lib/lldpad"
|
|
|
|
+ if [[ $hostonly_cmdline == "yes" ]] ; then
|
|
+ cmdline >> "${initdir}/etc/cmdline.d/95fcoe.conf"
|
|
+ echo >> "${initdir}/etc/cmdline.d/95fcoe.conf"
|
|
+ fi
|
|
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"
|
|
--
|
|
1.8.4.5
|
|
|