---
scripts/upd-instroot | 8 ++++----
storage/fcoe.py | 12 ++++++------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 584240e..dae3b12 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -160,7 +160,7 @@ PACKAGES="GConf2 NetworkManager ORBit2 acl anaconda
btrfs-progs bzip2 bzip2-libs ca-certificates cairo cjkuni-uming-fonts
comps-extras coreutils cpio cracklib cracklib-dicts cracklib-python
cryptsetup-luks cyrus-sasl-lib db4 dbus dbus-python dejavu-sans-fonts
- dcbd dejavu-sans-mono-fonts device-mapper device-mapper-libs
+ dejavu-sans-mono-fonts device-mapper device-mapper-libs
device-mapper-multipath device-mapper-multipath-libs
dhclient dmraid dmraid-libs
dogtail dosfstools e2fsprogs e2fsprogs-libs echo-icon-theme ethtool
@@ -177,7 +177,7 @@ PACKAGES="GConf2 NetworkManager ORBit2 acl anaconda
libglade2 libgnomecanvas libgcrypt libgpg-error libjpeg libnl
libpng libselinux libselinux-python libsemanage
libsemanage-python libsepol libssh2 libstdc++ libthai libtirpc libuser
- libuser-python libvolume_id libxcb libxkbfile libxml2 lklug-fonts
+ libuser-python libvolume_id libxcb libxkbfile libxml2 lklug-fonts lldpad
lohit-assamese-fonts lohit-bengali-fonts lohit-gujarati-fonts lohit-hindi-fonts
lohit-kashmiri-fonts lohit-kannada-fonts lohit-maithili-fonts lohit-marathi-fonts
lohit-oriya-fonts lohit-punjabi-fonts lohit-sindhi-fonts lohit-tamil-fonts
@@ -356,7 +356,6 @@ etc/NetworkManager/nm-system-settings.conf
etc/NetworkManager/dispatcher.d
etc/dbus-1/*
etc/dbus-1/system.d/*
-etc/dcbd
etc/fb.modes
etc/fcoe
etc/fonts
@@ -588,7 +587,6 @@ usr/sbin/NetworkManager
usr/sbin/addRamDisk
usr/sbin/anaconda
usr/sbin/chroot
-usr/sbin/dcbd
usr/sbin/dcbtool
usr/sbin/ddcprobe
usr/sbin/dmidecode
@@ -597,6 +595,7 @@ usr/sbin/fcoemon
usr/sbin/fbset
usr/sbin/genhomedircon
usr/sbin/gptsync
+usr/sbin/lldpad
usr/sbin/lvm
usr/sbin/prelink
usr/sbin/semodule
@@ -678,6 +677,7 @@ usr/share/zenity
usr/share/zoneinfo
var/lib/polkit-1
var/lib/dbus
+var/lib/lldpad
var/run/dbus
EOF
diff --git a/storage/fcoe.py b/storage/fcoe.py
index fb42be7..cffc9e2 100644
--- a/storage/fcoe.py
+++ b/storage/fcoe.py
@@ -53,7 +53,7 @@ class fcoe(object):
def __init__(self):
self.started = False
- self.dcbdStarted = False
+ self.lldpadStarted = False
self.fcoemonStarted = False
self.nics = []
@@ -86,14 +86,14 @@ class fcoe(object):
self.started = True
- def _startDcbd(self):
- if self.dcbdStarted:
+ def _startLldpad(self):
+ if self.lldpadStarted:
return
- iutil.execWithRedirect("dcbd", [ "-d" ],
+ iutil.execWithRedirect("lldpad", [ "-d" ],
stdout = "/dev/tty5", stderr="/dev/tty5",
searchPath = 1)
- self.dcbdStarted = True
+ self.lldpadStarted = True
def _startFcoemon(self):
if self.fcoemonStarted:
@@ -115,7 +115,7 @@ class fcoe(object):
searchPath = 1)
if dcb:
- self._startDcbd()
+ self._startLldpad()
iutil.execWithRedirect("dcbtool", [ "sc", nic, "dcb", "on" ],
stdout = "/dev/tty5", stderr="/dev/tty5",
searchPath = 1)
--
1.7.0
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
