[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [PATCH] fcoe: use fipvlan instead of fcoemon to bring up fcoe (#486244)



-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Ack.

On Thu, 6 May 2010, Hans de Goede wrote:

---
scripts/mk-images    |    2 +-
scripts/upd-instroot |    4 +++-
storage/fcoe.py      |   12 ++----------
3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/scripts/mk-images b/scripts/mk-images
index 7cee059..7525f9a 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -95,7 +95,7 @@ fi
TOPDIR=$(cd $TOPDIR; pwd)

# modules that are needed.  this is the generic "needed for every arch" stuff
-COMMONMODS="fat vfat nfs sunrpc lockd floppy cramfs loop edd pcspkr squashfs ipv6 virtio_pci netconsole"
+COMMONMODS="fat vfat nfs sunrpc lockd floppy cramfs loop edd pcspkr squashfs ipv6 8021q virtio_pci netconsole"
UMSMODS="ums-jumpshot ums-datafab ums-freecom ums-usbat ums-sddr55 ums-onetouch ums-alauda ums-karma ums-sddr09 ums-cypress"
USBMODS="$UMSMODS ohci-hcd uhci-hcd ehci-hcd usbhid mousedev usb-storage sd_mod sr_mod ub appletouch bcm5974"
FIREWIREMODS="ohci1394 sbp2 fw-ohci fw-sbp2 firewire-sbp2 firewire-ohci"
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 1e6d8e8..663be20 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -199,7 +199,7 @@ PACKAGES="GConf2 NetworkManager NetworkManager-gnome ORBit2 acl anaconda
    sysvinit-tools taipeifonts tcp_wrappers tcp_wrappers-libs telnet
    tigervnc-server tigervnc-server-module tzdata
    udev un-core-dotum-fonts urw-fonts usbutils util-linux-ng
-    vlgothic-fonts vim-minimal
+    vconfig vlgothic-fonts vim-minimal
    wget wpa_supplicant xcb-util xkeyboard-config xfsprogs xorg-x11-xauth
    xorg-x11-drivers xorg-x11-font-utils xorg-x11-fonts-ethiopic
    xorg-x11-fonts-misc xorg-x11-server-utils
@@ -485,6 +485,7 @@ sbin/swapon
sbin/tune2fs
sbin/udev*
sbin/umount.nfs*
+sbin/vconfig
sbin/xfs_repair
sbin/xfsrestore
sbin/ybin
@@ -600,6 +601,7 @@ usr/sbin/dmidecode
usr/sbin/efibootmgr
usr/sbin/fcoemon
usr/sbin/fbset
+usr/sbin/fipvlan
usr/sbin/genhomedircon
usr/sbin/gptsync
usr/sbin/lldpad
diff --git a/storage/fcoe.py b/storage/fcoe.py
index cd52bc8..e77caba 100644
--- a/storage/fcoe.py
+++ b/storage/fcoe.py
@@ -55,7 +55,6 @@ class fcoe(object):
    def __init__(self):
        self.started = False
        self.lldpadStarted = False
-        self.fcoemonStarted = False
        self.nics = []

    # So that users can write fcoe() to get the singleton instance
@@ -107,14 +106,6 @@ class fcoe(object):
                               stdout = "/dev/tty5", stderr="/dev/tty5")
        self.lldpadStarted = True

-    def _startFcoemon(self):
-        if self.fcoemonStarted:
-            return
-
-        iutil.execWithRedirect("fcoemon", [ ],
-                               stdout = "/dev/tty5", stderr="/dev/tty5")
-        self.fcoemonStarted = True
-
    def addSan(self, nic, dcb=False, intf=None):
        if not has_fcoe():
            raise IOError, _("FCoE not available")
@@ -131,7 +122,8 @@ class fcoe(object):
            iutil.execWithRedirect("dcbtool", [ "sc", nic, "app:fcoe",
                               "e:1", "a:1", "w:1" ],
                               stdout = "/dev/tty5", stderr="/dev/tty5")
-            self._startFcoemon()
+            iutil.execWithRedirect("fipvlan", [ nic, "-c", "-s" ],
+                               stdout = "/dev/tty5", stderr="/dev/tty5")
        else:
            f = open("/sys/module/fcoe/parameters/create", "w")
            f.write(nic)


- -- David Cantrell <dcantrell redhat com>
Red Hat / Honolulu, HI

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEARECAAYFAkvi3AYACgkQ5hsjjIy1VkmqaACg1/4T47Z0FRbkyuiVATtiSpYu
V2sAoNabsczQ5DwgLY2orwLdjTHpBnWN
=S1lS
-----END PGP SIGNATURE-----


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]