diff --git a/.gitignore b/.gitignore
index c45f859..587081f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,9 +33,3 @@ fcoe-utils-*.rpm
 /fcoe-utils-1.0.18.tar.bz2
 /fcoe-utils-1.0.19.tar.bz2
 /fcoe-utils-1.0.20.tar.bz2
-/fcoe-utils-1.0.21.tar.bz2
-/fcoe-utils-1.0.22.tar.bz2
-/fcoe-utils-1.0.23.tar.bz2
-/fcoe-utils-1.0.24.tar.bz2
-/fcoe-utils-1.0.25.tar.bz2
-/fcoe-utils-1.0.27.tar.bz2
diff --git a/0001-fcoemon-add-snprintf-string-precision-modifiers-in-f.patch b/0001-fcoemon-add-snprintf-string-precision-modifiers-in-f.patch
deleted file mode 100644
index 1c9e3b3..0000000
--- a/0001-fcoemon-add-snprintf-string-precision-modifiers-in-f.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From c54147b3ada8c37a536a4df90e8707538021ed20 Mon Sep 17 00:00:00 2001
-From: Chris Leech <cleech@redhat.com>
-Date: Fri, 4 Feb 2022 09:21:47 -0800
-Subject: [PATCH 1/1] fcoemon: add snprintf string precision modifiers in
- fcm_netif_advance
-
-GCC 12 is warning of potential snprintf truncations
-
-fcm_netif.ifname is an IFNAMSIZ array, but formating with %s doesn't
-understand that, so add a precision modifier every time we print it to
-limit the output.  This allows the compiler to verify that the output
-buffer is of sufficient length to never truncate.
-
-Signed-off-by: Chris Leech <cleech@redhat.com>
----
- fcoemon.c | 28 ++++++++++++++--------------
- 1 file changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/fcoemon.c b/fcoemon.c
-index 8c08bc5a032..b85f276c7df 100644
---- a/fcoemon.c
-+++ b/fcoemon.c
-@@ -3135,55 +3135,55 @@ static void fcm_netif_advance(struct fcm_netif *ff)
- 	case FCD_ERROR:
- 		break;
- 	case FCD_GET_DCB_STATE:
--		snprintf(buf, sizeof(buf), "%c%x%2.2x%2.2x%2.2x%2.2x%s",
-+		snprintf(buf, sizeof(buf), "%c%x%2.2x%2.2x%2.2x%2.2x%.*s",
- 			 DCB_CMD, CLIF_RSP_VERSION,
- 			 CMD_GET_CONFIG, FEATURE_DCB, 0,
--			 (u_int) strlen(ff->ifname), ff->ifname);
-+			 (u_int) strlen(ff->ifname), IFNAMSIZ, ff->ifname);
- 		ff->response_pending = fcm_dcbd_request(buf);
- 		break;
- 	case FCD_SEND_CONF:
- 		snprintf(params, sizeof(params), "%x1%x02",
- 			 ff->ff_app_info.enable,
- 			 ff->ff_app_info.willing);
--		snprintf(buf, sizeof(buf), "%c%x%2.2x%2.2x%2.2x%2.2x%s%s",
-+		snprintf(buf, sizeof(buf), "%c%x%2.2x%2.2x%2.2x%2.2x%.*s%s",
- 			 DCB_CMD, CLIF_RSP_VERSION,
- 			 CMD_SET_CONFIG, FEATURE_APP, APP_FCOE_STYPE,
--			 (u_int) strlen(ff->ifname), ff->ifname, params);
-+			 (u_int) strlen(ff->ifname), IFNAMSIZ, ff->ifname, params);
- 		ff->response_pending = fcm_dcbd_request(buf);
- 		break;
- 	case FCD_GET_PFC_CONFIG:
--		snprintf(buf, sizeof(buf), "%c%x%2.2x%2.2x%2.2x%2.2x%s%s",
-+		snprintf(buf, sizeof(buf), "%c%x%2.2x%2.2x%2.2x%2.2x%.*s%s",
- 			 DCB_CMD, CLIF_RSP_VERSION,
- 			 CMD_GET_CONFIG, FEATURE_PFC, 0,
--			 (u_int) strlen(ff->ifname), ff->ifname, "");
-+			 (u_int) strlen(ff->ifname), IFNAMSIZ, ff->ifname, "");
- 		ff->response_pending = fcm_dcbd_request(buf);
- 		break;
- 	case FCD_GET_APP_CONFIG:
--		snprintf(buf, sizeof(buf), "%c%x%2.2x%2.2x%2.2x%2.2x%s%s",
-+		snprintf(buf, sizeof(buf), "%c%x%2.2x%2.2x%2.2x%2.2x%.*s%s",
- 			 DCB_CMD, CLIF_RSP_VERSION,
- 			 CMD_GET_CONFIG, FEATURE_APP, APP_FCOE_STYPE,
--			 (u_int) strlen(ff->ifname), ff->ifname, "");
-+			 (u_int) strlen(ff->ifname), IFNAMSIZ, ff->ifname, "");
- 		ff->response_pending = fcm_dcbd_request(buf);
- 		break;
- 	case FCD_GET_PFC_OPER:
--		snprintf(buf, sizeof(buf), "%c%x%2.2x%2.2x%2.2x%2.2x%s%s",
-+		snprintf(buf, sizeof(buf), "%c%x%2.2x%2.2x%2.2x%2.2x%.*s%s",
- 			 DCB_CMD, CLIF_RSP_VERSION,
- 			 CMD_GET_OPER, FEATURE_PFC, 0,
--			 (u_int) strlen(ff->ifname), ff->ifname, "");
-+			 (u_int) strlen(ff->ifname), IFNAMSIZ, ff->ifname, "");
- 		ff->response_pending = fcm_dcbd_request(buf);
- 		break;
- 	case FCD_GET_APP_OPER:
--		snprintf(buf, sizeof(buf), "%c%x%2.2x%2.2x%2.2x%2.2x%s%s",
-+		snprintf(buf, sizeof(buf), "%c%x%2.2x%2.2x%2.2x%2.2x%.*s%s",
- 			 DCB_CMD, CLIF_RSP_VERSION,
- 			 CMD_GET_OPER, FEATURE_APP, APP_FCOE_STYPE,
--			 (u_int) strlen(ff->ifname), ff->ifname, "");
-+			 (u_int) strlen(ff->ifname), IFNAMSIZ, ff->ifname, "");
- 		ff->response_pending = fcm_dcbd_request(buf);
- 		break;
- 	case FCD_GET_PEER:
--		snprintf(buf, sizeof(buf), "%c%x%2.2x%2.2x%2.2x%2.2x%s%s",
-+		snprintf(buf, sizeof(buf), "%c%x%2.2x%2.2x%2.2x%2.2x%.*s%s",
- 			 DCB_CMD, CLIF_RSP_VERSION,
- 			 CMD_GET_PEER, FEATURE_APP, APP_FCOE_STYPE,
--			 (u_int) strlen(ff->ifname), ff->ifname, "");
-+			 (u_int) strlen(ff->ifname), IFNAMSIZ, ff->ifname, "");
- 		ff->response_pending = fcm_dcbd_request(buf);
- 		break;
- 	case FCD_DONE:
--- 
-2.34.1
-
diff --git a/0002-Don-t-attempt-to-memcpy-zero-bytes.patch b/0002-Don-t-attempt-to-memcpy-zero-bytes.patch
deleted file mode 100644
index fa45a14..0000000
--- a/0002-Don-t-attempt-to-memcpy-zero-bytes.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 78a5e2e17bba531b41101ca036a5bb1a0d5caca5 Mon Sep 17 00:00:00 2001
-From: Stephen Gallagher <sgallagh@redhat.com>
-Date: Tue, 6 Feb 2024 21:15:33 -0500
-Subject: [PATCH 2/2] Don't attempt to memcpy() zero bytes
-
-add_rtattr_nest() is called in several places in the code. As part of
-its operation, it calls add_rtattr(nm type, NULL, 0) which results in
-NULL and 0 being passed to memcpy(). This fails with -Werror=nonnull
-on recent GCC.
-
-Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
----
- lib/rtnetlink.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/lib/rtnetlink.c b/lib/rtnetlink.c
-index 3b8413718997568a20752791807b19c1f299955e..faa60d7c12f68af175d223b6c3c3257a982e4f37 100644
---- a/lib/rtnetlink.c
-+++ b/lib/rtnetlink.c
-@@ -172,7 +172,10 @@ static void add_rtattr(struct nlmsghdr *n, int type, const void *data, int alen)
- 
- 	rta->rta_type = type;
- 	rta->rta_len = len;
--	memcpy(RTA_DATA(rta), data, alen);
-+	if (alen > 0)
-+	{
-+		memcpy(RTA_DATA(rta), data, alen);
-+	}
- 	n->nlmsg_len = NLMSG_ALIGN(n->nlmsg_len) + RTA_ALIGN(len);
- }
- 
--- 
-2.43.0
-
diff --git a/0003-initialization-discards-const-qualifier-from-pointer.patch b/0003-initialization-discards-const-qualifier-from-pointer.patch
deleted file mode 100644
index 39fc30e..0000000
--- a/0003-initialization-discards-const-qualifier-from-pointer.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From dfadd3fd53860a8f44871e479bf602a2fa3bae53 Mon Sep 17 00:00:00 2001
-From: Chris Leech <cleech@redhat.com>
-Date: Tue, 6 Jan 2026 16:20:49 -0800
-Subject: [PATCH 1/1] =?UTF-8?q?initialization=20discards=20=E2=80=98const?=
- =?UTF-8?q?=E2=80=99=20qualifier=20from=20pointer=20target=20type?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Chris Leech <cleech@redhat.com>
----
- lib/fcoe_utils.c | 2 +-
- lib/sysfs_hba.c  | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/fcoe_utils.c b/lib/fcoe_utils.c
-index 4d13dd7ecf9..5ea713679a5 100644
---- a/lib/fcoe_utils.c
-+++ b/lib/fcoe_utils.c
-@@ -161,7 +161,7 @@ int fcoe_checkdir(char *dir)
-  */
- char *get_ifname_from_symbolic_name(const char *symbolic_name)
- {
--	char *last_space = strrchr(symbolic_name, ' ');
-+	const char *last_space = strrchr(symbolic_name, ' ');
- 
- 	if (!last_space || strlen(last_space) == 1)
- 		return NULL;
-diff --git a/lib/sysfs_hba.c b/lib/sysfs_hba.c
-index 381f335d7ea..302ce634954 100644
---- a/lib/sysfs_hba.c
-+++ b/lib/sysfs_hba.c
-@@ -441,7 +441,7 @@ char *get_pci_dev_from_netdev(const char *netdev)
- 	free(path);
- 	if (ret == -1) {
- 		char realdev[256];
--		char *subif;
-+		const char *subif;
- 		size_t len;
- 
- 		subif = strchr(netdev, '.');
--- 
-2.52.0
-
diff --git a/fcoe-utils-1.0.18-config.patch b/fcoe-utils-1.0.18-config.patch
new file mode 100644
index 0000000..4c5ec66
--- /dev/null
+++ b/fcoe-utils-1.0.18-config.patch
@@ -0,0 +1,13 @@
+diff --git a/etc/config b/etc/config
+index c993f35..bfccf8c 100644
+--- a/etc/config
++++ b/etc/config
+@@ -12,3 +12,8 @@ USE_SYSLOG="yes"
+ ## Default:    list of default drivers
+ # All supported drivers listed here are loaded when service starts
+ SUPPORTED_DRIVERS="fcoe bnx2fc"
++
++## Type:       integer
++## Default:    65
++# Wait at most for this amount of seconds to discover all _netdev fstab devices
++WAIT_TIMEOUT="65"
diff --git a/fcoe-utils-1.0.18-help.patch b/fcoe-utils-1.0.18-help.patch
new file mode 100644
index 0000000..c9ea696
--- /dev/null
+++ b/fcoe-utils-1.0.18-help.patch
@@ -0,0 +1,13 @@
+diff --git a/fcnsq.c b/fcnsq.c
+index 8722b21..466a85e 100644
+--- a/fcnsq.c
++++ b/fcnsq.c
+@@ -360,7 +360,7 @@ static void help(int status)
+ 		"  --gspn <port id>\n"
+ 		"  --gsnn <world wide node name>\n"
+ 		"Options:\n"
+-		"  --quiet	print minimal results on success, and no error messages\n"
++		"  --quiet|-q	print minimal results on success, and no error messages\n"
+ 		"\n"
+ 		"Port IDs and World Wide Names must be specified in hexadecimal.\n"
+ 		);
diff --git a/fcoe-utils-1.0.19-make.patch b/fcoe-utils-1.0.19-make.patch
new file mode 100644
index 0000000..46b553f
--- /dev/null
+++ b/fcoe-utils-1.0.19-make.patch
@@ -0,0 +1,27 @@
+diff --git a/Makefile.am b/Makefile.am
+index c5c99e5..a36cf7c 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,7 +2,7 @@
+ sbin_PROGRAMS = fcoeadm fcoemon fcping fipvlan fcnsq fcrls
+ 
+ ## all targets should look for headers in the include directory
+-AM_CPPFLAGS = -I${srcdir}/include -I${builddir}/include
++AM_CPPFLAGS = -I${srcdir}/include -I${builddir}/include -I/lib/modules/`rpm -q --list kernel | grep "^/lib/modules/.*/build$$" | cut -f4 -d"/" | sort -r | head -1`/build/include
+ ## pass the sysconfdir into the C proprocessor
+ AM_CPPFLAGS += -DSYSCONFDIR="\"${sysconfdir}\""
+ AM_CFLAGS = -Wall
+@@ -66,12 +66,9 @@ init_d_SCRIPTS = etc/initd/fcoe
+ 
+ dist_noinst_DATA = README COPYING INSTALL fcoe-utils.spec etc/config
+ 
+-BASH_COMPLETION_DIR=/etc/bash_completion.d/
++BASH_COMPLETION_DIR=${DESTDIR}/etc/bash_completion.d/
+ 
+ install-data-hook:
+-	if [ ! -f ${DESTDIR}${fcoe_configdir}/config ] ; then \
+-		cp ${srcdir}/etc/config ${DESTDIR}${fcoe_configdir}/config; \
+-	fi; \
+ 	if [ ! -d "${BASH_COMPLETION_DIR}" ] ; then \
+ 		mkdir ${BASH_COMPLETION_DIR}; \
+ 	fi; \
diff --git a/fcoe-utils-1.0.20-init.patch b/fcoe-utils-1.0.20-init.patch
new file mode 100644
index 0000000..8f493c0
--- /dev/null
+++ b/fcoe-utils-1.0.20-init.patch
@@ -0,0 +1,111 @@
+diff --git a/etc/initd/initd.fedora b/etc/initd/initd.fedora
+index 5c84e25..f3f3d91 100755
+--- a/etc/initd/initd.fedora
++++ b/etc/initd/initd.fedora
+@@ -15,7 +15,7 @@
+ # this program; if not, write to the Free Software Foundation, Inc.,
+ # 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ #
+-# chkconfig: - 21 80
++# chkconfig: 2345 21 80
+ #
+ # Maintained at www.Open-FCoE.org
+ 
+@@ -23,7 +23,7 @@
+ # Provides: fcoe
+ # Required-Start: network
+ # Required-Stop:
+-# Default-Start:
++# Default-Start: 2 3 4 5
+ # Default-Stop:
+ # Short-Description: Open-FCoE Initiator
+ # Description: Open-FCoE Initiator
+@@ -63,6 +63,16 @@ test -x $FCOEMON || {
+ 	fi
+ }
+ 
++have_fcoe_root() {
++	# This simply checks if root is on a net device
++	local rootopts=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $4; }}' /etc/mtab)
++	if [[ "$rootopts" =~ "_netdev" ]]; then
++		return 0
++	else
++		return 1
++	fi
++}
++
+ start()
+ {
+ 	echo -n $"Starting FCoE initiator service: "
+@@ -75,26 +85,59 @@ start()
+ 	echo
+ 	touch /var/lock/subsys/fcoe
+ 
++	# Wait for the _netdev devices
++	if [ "$WAIT_TIMEOUT" = "" ]; then
++		WAIT_TIMEOUT=65
++	fi
++	local donewait=1
++	local devs=($(egrep 'by-path\/fc-.*_netdev' /etc/fstab | cut -d ' ' -f1))
++	if [ "$devs" != "" ]; then
++		echo -n "Waiting for FCoE devices . "
++		while [ $WAIT_TIMEOUT -gt 0 ]; do
++			for disk in ${devs[*]}; do
++				if ! test -b $disk; then
++					donewait=0
++					break
++				fi
++			done
++			test $donewait -eq 1 && break;
++			sleep 1
++			echo -n ". "
++			donewait=1
++			WAIT_TIMEOUT=$(($WAIT_TIMEOUT-1))
++			done
++		if [ "$WAIT_TIMEOUT" -eq 0 ]; then
++			echo "timed out!"
++		else
++			echo "done!"
++		fi
++	fi
++
+ 	echo
+ }
+ 
+ stop()
+ {
+-	local force=$1
+-
+-	pid=$(pidof "$FCOEMON")
+-	if [ "$force" == "force" ]
+-	then
+-		action "Destroying any active fcoe interface/s"
+-		[ "$pid" ] && kill -HUP $pid
++	if have_fcoe_root; then
++		echo $"Possible FCoE root detected, not stopping FCoE."
++		exit 1
+ 	else
+-		[ "$pid" ] && kill -TERM $pid
+-	fi
++		local force=$1
++
++		pid=$(pidof "$FCOEMON")
++		if [ "$force" == "force" ]
++		then
++			action "Destroying any active fcoe interface/s"
++			[ "$pid" ] && kill -HUP $pid
++		else
++			[ "$pid" ] && kill -TERM $pid
++		fi
+ 
+-	action $"Stopping FCoE initiator service: "
++		action $"Stopping FCoE initiator service: "
+ 
+-	rm -f ${PID_FILE}
+-	rm -f /var/lock/subsys/fcoe
++		rm -f ${PID_FILE}
++		rm -f /var/lock/subsys/fcoe
++	fi
+ }
+ 
+ status()
diff --git a/fcoe-utils.spec b/fcoe-utils.spec
index 1794653..1575c76 100644
--- a/fcoe-utils.spec
+++ b/fcoe-utils.spec
@@ -1,295 +1,102 @@
 # https://fedoraproject.org/wiki/Packaging:Guidelines#Compiler_flags
-%global _hardened_build 1
-
-# v1.0.34-2
-%global commit0      b233050792cc5fa54ba1da257706ca2b5ef3c987
-%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+%define _hardened_build 1
 
 Name:               fcoe-utils
-Version:            1.0.34
-Release:            13.git%{shortcommit0}%{?dist}
+Version:            1.0.20
+Release:            5%{?dist}
 Summary:            Fibre Channel over Ethernet utilities
-License:            GPL-2.0-only
+Group:              Applications/System
+License:            GPLv2
 URL:                http://www.open-fcoe.org
-Source0:            https://github.com/openSUSE/fcoe-utils/archive/%{commit0}.tar.gz#/%{name}-%{version}-%{shortcommit0}.tar.gz
-ExcludeArch:        ppc s390
-BuildRequires:      autoconf
-BuildRequires:      automake
-BuildRequires:      libtool
-BuildRequires:      libpciaccess-devel
+# git://open-fcoe.org/fcoe/fcoe-utils.git
+Source0:            %{name}-%{version}.tar.bz2
+Source1:            quickstart.txt
+Source2:            fcoe.service
+Source3:            fcoe.config
+# Generic Fedora patches
+Patch0:             fcoe-utils-1.0.20-init.patch
+Patch1:             fcoe-utils-1.0.19-make.patch
+Patch2:             fcoe-utils-1.0.18-help.patch
+Patch3:             fcoe-utils-1.0.18-config.patch
+BuildRequires:      libtool automake autoconf
 BuildRequires:      lldpad-devel >= 0.9.43
-BuildRequires:      systemd
-BuildRequires:      make
+BuildRequires:      libhbaapi-devel >= 2.2-12
+BuildRequires:      libnl-devel
+BuildRequires:      systemd-units
 Requires:           lldpad >= 0.9.43
+Requires:           libhbalinux >= 1.0.12
 Requires:           iproute
 Requires:           device-mapper-multipath
-Requires(post):     systemd
-Requires(preun):    systemd
-Requires(postun):   systemd
-
-Patch1: 0001-fcoemon-add-snprintf-string-precision-modifiers-in-f.patch
-
-# https://github.com/openSUSE/fcoe-utils/pull/25
-Patch2: 0002-Don-t-attempt-to-memcpy-zero-bytes.patch
-
-Patch3: 0003-initialization-discards-const-qualifier-from-pointer.patch
-
-# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
-ExcludeArch: %{ix86}
+Requires(post):     systemd-units
+Requires(preun):    systemd-units
+Requires(postun):   systemd-units
 
 %description
 Fibre Channel over Ethernet utilities
 fcoeadm - command line tool for configuring FCoE interfaces
-fcoemon - service to configure DCB Ethernet QOS filters, works with lldpad
+fcoemon - service to configure DCB Ethernet QOS filters, works with dcbd
+or lldpad
 
 %prep
-%autosetup -p1 -n fcoe-utils-%{commit0}
-%if 0%{?rhel} >= 8
-# RHEL dropped support for software fcoe (fcoe.ko)
-sed -i 's/^\(SUPPORTED_DRIVERS\)=".*"$/\1="bnx2fc qedf"/' etc/config
-# make the defaults sane for supported offload drivers
-sed -i 's/^\(DCB_REQUIRED\)=".*"$/\1="no"/' etc/cfg-ethx
-%endif
+%setup -q
+%patch0 -p1 -b .init
+%patch1 -p1 -b .make
+%patch2 -p1 -b .help
+%patch3 -p1 -b .config
 
 %build
 ./bootstrap.sh
-%configure --with-systemdsystemunitdir=%{_unitdir}
+%configure
 make %{?_smp_mflags}
 
 %install
 make install DESTDIR=%{buildroot}
 rm -rf %{buildroot}/etc/init.d
+install -m 644 %{SOURCE1} quickstart.txt
+mkdir -p %{buildroot}%{_sysconfdir}/sysconfig %{buildroot}%{_unitdir}
+install -m 644 %{SOURCE2} %{buildroot}%{_unitdir}
+install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/fcoe
 mkdir -p %{buildroot}%{_libexecdir}/fcoe
-for file in \
-    contrib/*.sh \
-    debug/*sh
-    do install -m 755 ${file} %{buildroot}%{_libexecdir}/fcoe/
-done
+install -m 755 contrib/fcc.sh %{buildroot}%{_libexecdir}/fcoe/fcc.sh
+install -m 755 contrib/fcoe_edd.sh %{buildroot}%{_libexecdir}/fcoe/fcoe_edd.sh
+install -m 755 contrib/fcoe-setup.sh %{buildroot}%{_libexecdir}/fcoe/fcoe-setup.sh
+install -m 755 debug/fcoedump.sh %{buildroot}%{_libexecdir}/fcoe/fcoedump.sh
+install -m 755 debug/dcbcheck.sh %{buildroot}%{_libexecdir}/fcoe/dcbcheck.sh
 
 %post
-%systemd_post fcoe.service fcoemon.socket
+if [ $1 -eq 1 ]; then
+    systemctl daemon-reload >/dev/null 2>&1 || :
+fi
 
 %preun
-%systemd_preun fcoe.service fcoemon.socket
+if [ $1 -eq 0 ]; then
+    systemctl --no-reload disable fcoe.service >/dev/null 2>&1 || :
+    systemctl stop fcoe.service >/dev/null 2>&1 || :
+fi
 
 %postun
-%systemd_postun_with_restart fcoe.service fcoemon.socket
+if [ $1 -ge 1 ]; then
+    systemctl try-restart %{name}.service >/dev/null 2>&1 || :
+fi
 
 %files
-%doc README COPYING QUICKSTART
+%doc README COPYING quickstart.txt
 %{_sbindir}/*
 %{_mandir}/man8/*
 %{_unitdir}/fcoe.service
-%{_unitdir}/fcoemon.socket
-%{_sysconfdir}/fcoe/
+%config(noreplace) %{_sysconfdir}/sysconfig/fcoe
+%dir %{_sysconfdir}/fcoe/
 %config(noreplace) %{_sysconfdir}/fcoe/cfg-ethx
-%config(noreplace) %{_sysconfdir}/fcoe/config
-%{_datadir}/bash-completion/completions/*
-%{_libexecdir}/fcoe/
+%dir %{_sysconfdir}/bash_completion.d/
+%{_sysconfdir}/bash_completion.d/*
+%attr(0755,root,root) %{_libexecdir}/fcoe/fcoe_edd.sh
+%attr(0755,root,root) %{_libexecdir}/fcoe/fcoe-setup.sh
+%attr(0755,root,root) %{_libexecdir}/fcoe/fcc.sh
+%attr(0755,root,root) %{_libexecdir}/fcoe/fcoedump.sh
+%attr(0755,root,root) %{_libexecdir}/fcoe/dcbcheck.sh
+
 
 %changelog
-* Wed Jan 07 2026 Chris Leech <cleech@redhat.com> - 1.0.34-13.gitb233050
-- FTBFS: GCC 16 -Werror=discarded-qualifiers
-
-* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.34-12.gitb233050
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.34-11.gitb233050
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.34-10.gitb233050
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Tue Feb 06 2024 Stephen Gallagher <sgallagh@redhat.com> - 1.0.34-9.gitb233050
-- FTBFS: Don't attempt to memcpy() zero bytes
-
-* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.34-8.gitb233050
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.34-7.gitb233050
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Oct 30 2023 Chris Leech <cleech@redhat.com> - 1.0.34-6.gitb233050
-- use SPDX in license tag
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.34-5.gitb233050
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.34-4.gitb233050
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.34-3.gitb233050
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Fri Feb 04 2022 Chris Leech <cleech@redhat.com> - 1.0.34-2.gitb233050
-- FTBFS: more gcc 12 snprintf truncation issues on 32-bit arch
-
-* Fri Jan 28 2022 Chris Leech <cleech@redhat.com> - 1.0.34-1.gitb233050
-- FTBFS: update with gcc 12 fix from upstream
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.34-0.git14ef0d2.2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.34-0.git14ef0d2.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Wed Apr 14 2021 Chris Leech <cleech@redhat.com> - 1.0.34-0.git14ef0d2
-- upstream 1.0.34
-- drop gcc11 warning disabling patch, warnings have been addressed upstream
-
-* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.0.33-6.git848bcc6
-- Rebuilt for updated systemd-rpm-macros
-  See https://pagure.io/fesco/issue/2583.
-
-* Tue Feb 02 2021 Chris Leech <cleech@redhat.com> - 1.0.33-5.git848bcc6
-- add in RHEL conditional for removed fcoe.ko support
-
-* Mon Feb 01 2021 Chris Leech <cleech@redhat.com> - 1.0.33-4.git848bcc6
-- drop any differences with upstream service and config files
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.33-3.gitfe376de
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Sat Nov 14 2020 Jeff Law <law@redhat.com> - 1.0.33-2.gitfe376de
-- Disable fatal diagnostic from gcc-11 for fping
-
-* Wed Oct 28 2020 Jeff Law <law@redhat.com> - 1.0.33-1.gitfe376de
-- Disable fatal diagnostics from gcc-11 for fipvlan
-
-* Mon Sep 21 2020 Chris Leech <cleech@redhat.com> - 1.0.33-0.gitfe376de
-- FTBFS: fix gcc 10.2 truncation and overflow errors
-- rebase to 1.0.33+ from new upstream location
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.32-12.git9834b34
-- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.32-11.git9834b34
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.32-10.git9834b34
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.32-9.git9834b34
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Tue Jun 04 2019 Chris Leech <cleech@redhat.com> - 1.0.32-8.git9834b34
-- fix more string function issues breaking the build with newer gcc
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.32-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.32-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri Mar 16 2018 Chris Leech <cleech@redhat.com> - 1.0.32-5
-- fix some newer gcc 8 truncation format errors
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.32-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.32-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.32-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Thu Feb 09 2017 Chris Leech <cleech@redhat.com> - 1.0.32-1
-- update to 1.0.32
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.30-5.git91c0c8c
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Mon Feb 01 2016 Chris Leech <cleech@redhat.com> - 1.0.30-4.git91c0c8c
-- 1303433 package should not attempt to own /etc/bash_completion.d
-
-* Mon Jul 06 2015 Chris Leech <cleech@redhat.com> - 1.0.30-2
-- fix display when libhbalinux includes hosts without a serial number
-
-* Tue Jun 16 2015 Chris Leech <cleech@redhat.com> - 1.0.30-1
-- rebase to upstream v1.0.30-2-g91c0c8c
-
-* Fri Oct 24 2014 Chris Leech <cleech@redhat.com> - 1.0.29-7
-- enable vn2vn mode in fcoeadm
-
-* Tue Oct 07 2014 Chris Leech <cleech@redhat.com> - 1.0.29-6
-- update to upstream v1.0.29-29-g9267509
-
-* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.29-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.29-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Thu Nov 07 2013 Petr Šabata <contyk@redhat.com> - 1.0.29-3
-- Fix configure.ac for automake 1.14
-
-* Thu Nov 07 2013 Petr Šabata <contyk@redhat.com> - 1.0.29-2
-- Don't install the old configuration file alongside the new one
-- Add bnx2fc to the SUPPORTED_DRIVERS for consistency with previous configuration
-
-* Thu Aug 29 2013 Petr Šabata <contyk@redhat.com> - 1.0.29-1
-- 1.0.29 bump
-
-* Wed Jul 31 2013 Petr Šabata <contyk@redhat.com> - 1.0.28-4
-- Drop the initscript-specific config patch
-
-* Wed Jul 31 2013 Petr Šabata <contyk@redhat.com> - 1.0.28-3
-- Require just 'systemd' instead of 'systemd-units'
-- Patch the fcoemon manpage with a note for systemd users
-
-* Mon Jun 10 2013 Petr Šabata <contyk@redhat.com> - 1.0.28-2
-- Enhance the format strings patch to fix ppc64 build failures too
-
-* Tue Jun 04 2013 Petr Šabata <contyk@redhat.com> - 1.0.28-1
-- 1.0.28 bump
-
-* Wed Mar 06 2013 Petr Šabata <contyk@redhat.com> - 1.0.27-1
-- 1.0.27 bump
-
-* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.25-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Wed Jan 09 2013 Petr Šabata <contyk@redhat.com> - 1.0.25-2
-- Don't build for s390x since it's not supported by kernel either
-
-* Tue Nov 27 2012 Petr Šabata <contyk@redhat.com> - 1.0.25-1
-- 1.0.25 (with latest fixes)
-- Simplify the spec a bit
-- Fix bogus dates in changelog
-
-* Thu Nov 01 2012 Petr Šabata <contyk@redhat.com> - 1.0.25-1
-
-* Tue Aug 28 2012 Petr Šabata <contyk@redhat.com> - 1.0.24-2
-- Migrate to systemd scriptlets (#850104)
-
-* Wed Aug 15 2012 Petr Šabata <contyk@redhat.com> - 1.0.24-1
-- 1.0.24 bump
-
-* Mon Jul 23 2012 Petr Šabata <contyk@redhat.com> - 1.0.23-3
-- Don't exclude s390x.
-- Add AM_PROG_AR to configure.ac.
-
-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.23-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Mon Jun 25 2012 Petr Šabata <contyk@redhat.com> - 1.0.23-1
-- Update to 1.0.23
-- Re-introduce ExcludeArch to be in line with EL.
-
-* Thu Feb 16 2012 Petr Šabata <contyk@redhat.com> - 1.0.22-2
-- Fix the incorrect libhbalinux runtime dependency
-
-* Mon Jan 23 2012 Petr Šabata <contyk@redhat.com> - 1.0.22-1
-- 1.0.22 bump
-- Remove dcbd from Description
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.21-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Thu Nov 24 2011 Petr Šabata <contyk@redhat.com> - 1.0.21-1
-- 1.0.21 bump
-
 * Mon Oct 31 2011 Petr Sabata <contyk@redhat.com> - 1.0.20-5
 - Remove useless PIDFile from fcoe.service unit file
 
@@ -311,7 +118,7 @@ done
 * Thu Jun 02 2011 Petr Sabata <contyk@redhat.com> - 1.0.19-1
 - 1.0.19 bump
 
-* Tue May  3 2011 Petr Sabata <psabata@redhat.com> - 1.0.18-2
+* Wed May  3 2011 Petr Sabata <psabata@redhat.com> - 1.0.18-2
 - fcoemon: Do not create a world and group writable PID file
 
 * Wed Apr 20 2011 Petr Sabata <psabata@redhat.com> - 1.0.18-1
@@ -402,7 +209,7 @@ done
 * Mon May 4 2009 Jan Zeleny <jzeleny@redhat.com> - 1.0.7-5
 - fixed SIGSEGV when fcoe module isn't loaded (#498550)
 
-* Mon Apr 27 2009 Jan Zeleny <jzeleny@redhat.com> - 1.0.7-4
+* Wed Apr 27 2009 Jan Zeleny <jzeleny@redhat.com> - 1.0.7-4
 - added libhbalinux to Requires (#497605)
 - correction of spec file (_initddir -> _initrddir)
 
diff --git a/fcoe.config b/fcoe.config
new file mode 100644
index 0000000..635a01b
--- /dev/null
+++ b/fcoe.config
@@ -0,0 +1,5 @@
+# All supported drivers listed here are loaded when service starts
+SUPPORTED_DRIVERS="libfc fcoe"
+
+# Add --debug to enable debug messages
+FCOEMON_OPTS="--syslog"
diff --git a/fcoe.service b/fcoe.service
new file mode 100644
index 0000000..8c438c7
--- /dev/null
+++ b/fcoe.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Open-FCoE Inititator.
+After=syslog.target network.target lldpad.service
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/sysconfig/fcoe
+ExecStartPre=/sbin/modprobe -qa $SUPPORTED_DRIVERS
+ExecStart=/usr/sbin/fcoemon $FCOEMON_OPTS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/quickstart.txt b/quickstart.txt
new file mode 100644
index 0000000..fdb6e3f
--- /dev/null
+++ b/quickstart.txt
@@ -0,0 +1,25 @@
+Quick Start guide for Open-FCoE
+===============================
+
+1. Install fcoe-utils package.  This should also install dcbd, libhbaapi and
+   libhbalinux as dependencies.
+
+2. Rename /etc/fcoe/cfg-ethx so it corresponds with name of your network
+   interface (e.g. /etc/fcoe/cfg-eth0). Copy and rename this file accordingly
+   if you have more interfaces, which should be fcoe-enabled
+
+3. Modify configuration files to enable FCoE. Set FCOE_ENABLE="yes" and
+   DCB_REQUIRED="yes".
+
+3. Run 'systemctl enable fcoe.service' to start FCoE per run level. This
+   will setup FCoE to start on reboot.
+
+4. Run 'systemctl enable lldpad.service' to start LLDP agent per run
+   level. This will setup DCB to start on reboot.
+
+5. Run 'systemctl start lldpad.service' to start LLDP agent.
+
+6. Run 'dcbtool sc ethX dcb on; dcbtool sc ethX app:0 e:1;' for each fcoe-enabled
+   interface to setup DCB for FCoE.
+
+7. Run 'systemctl start fcoe.sertvice' to start FCoE.
diff --git a/sources b/sources
index 31e1a11..8b37a56 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fcoe-utils-1.0.34-b233050.tar.gz) = 8fc7df765fb7a2a17f9d3b9ce67b2499b7f602671d75be663cb7a668b0cbdfe7126796548c16496dac964549c695de844e6599c026a71f3b67d3d5fe6c29f858
+d23061aa7e353c5df14cc2429314117b  fcoe-utils-1.0.20.tar.bz2
diff --git a/tests/README.md b/tests/README.md
deleted file mode 100644
index ce04773..0000000
--- a/tests/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# fcoe-utils
-
-This is the sanity testing on package of fcoe-utils, since sw fcoe testing requires the san environment, I just do sanity check on the package installation and important information inside of it.
diff --git a/tests/sanity/LICENSE b/tests/sanity/LICENSE
deleted file mode 100644
index 94a9ed0..0000000
--- a/tests/sanity/LICENSE
+++ /dev/null
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/tests/sanity/PURPOSE b/tests/sanity/PURPOSE
deleted file mode 100644
index 3ac049e..0000000
--- a/tests/sanity/PURPOSE
+++ /dev/null
@@ -1,2 +0,0 @@
-PURPOSE of /kernel/storage/sw_fcoe/sanity
-This test sanity for fcoe-utils package
diff --git a/tests/sanity/main.sh b/tests/sanity/main.sh
deleted file mode 100755
index 932618c..0000000
--- a/tests/sanity/main.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2016 Red Hat, Inc. 
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#   Author: Xiaonan He <xhe@redhat.com>
-ls
-#set -x
-source tc.sh || exit 200
-yum update -y fcoe-utils
-if [ $? -ne 0 ];then
-	exit 1
-fi
-	
-tlog "running $0"
-trun "yum info fcoe-utils"
-trun "uname -a"
-tok "[[ -f /usr/sbin/fipvlan ]]"
-tend
diff --git a/tests/sanity/runtest.sh b/tests/sanity/runtest.sh
deleted file mode 100755
index 0066330..0000000
--- a/tests/sanity/runtest.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2006 Red Hat, Inc. This copyrighted material 
-# is made available to anyone wishing to use, modify, copy, or
-# redistribute it subject to the terms and conditions of the GNU General
-# Public License v.2.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# Author: Xiaonan He <xhe@redhat.com>
-rhts-run-simple-test sanity_check "./main.sh"
diff --git a/tests/sanity/tc.sh b/tests/sanity/tc.sh
deleted file mode 100755
index d54cd63..0000000
--- a/tests/sanity/tc.sh
+++ /dev/null
@@ -1,233 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2016 Red Hat, Inc. 
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#test x$LXT_TC = x || return
-#LXT_TC=1
-#
-# print the current date
-# usage: d=$(tdate)
-#
-tdate () 
-{
-    date '+%T' 2>/dev/null
-}
-#
-# print the log information
-# usage: tlog "hello world" "WARNING"
-#
-tlog ()
-{
-    local msg=$1
-    local log_level=${2:-INFO}
-    local cur_date=$(tdate)
-    echo "[$log_level][$cur_date]$msg"
-    
-    return 0
-}
-#
-# run the cmd and format the log. return the exitint status of cmd
-# use the global variables: tSTDOUT and tSTDERR to return the stdout and stderr
-# usage: trun "ls"
-#        trun "ls"; echo $?
-#        stdout=$tSTDOUT
-#        stderr=$tSTDERR
-#
-trun ()
-{
-    local cmd="$*"
-    
-    _trun_ "$cmd"
-}
-#
-# verify the execution of command
-# if the cmd return 0, mark this checkpoint failed and return 1
-# if not, mark it passed and return 0
-# usage: tnot "ls /not_existing"
-#
-tnot () {
-    local cmd="$*"
-    _trun_ "$cmd" 1
-    if test $? -eq 0; then 
-        tfail_ "$cmd" ;
-    else
-        tpass_ "$cmd" ;
-    fi 
-}
-#
-# verify the execution of command
-# if the cmd return 0, mark this checkpoint passed and return 0
-# if not, mark it failed and return 1
-# usage: tok "ls /"
-#
-tok ()
-{
-    local cmd="$*"
-    _trun_ "$cmd" 0
-    if test $? -eq 0; then 
-        tpass_ "$cmd" ;
-    else
-        tfail_ "$cmd" ;
-    fi 
-}
-#
-# verify the execution of command
-# if the cmd return 0, mark this checkpoint passed and return 0
-# if not, mark it failes and exit
-# usage: terr "ls"
-#
-#terr ()
-#{
-#    tok "$*" || tend
-#}
-#
-# verify the execution of command
-# if the cmd return 0, will continue to run the script
-# if not, mark it failes and exit
-# usage: terr "ls"
-#
-terr ()
-{
-    local cmd="$*"
-    _trun_ "$cmd" 0
-    if test $? -ne 0; then 
-        tfail_ "$cmd" ;
-        tend ;
-    fi 
-}
-#
-# exit the program and print the log message
-# usage: texit "error message" 100
-# similar to the exception 
-#
-texit ()
-{
-    msg=$1
-    err=$2
-    is_null $err && err=1
-    test $err -lt 1 || err=1 
-    tlog "$msg" "ERROR"
-    exit $2 
-}
-#
-# print the test report, cleanup the testing bed and  close the testing. 
-# usage: tend
-#
-tend ()
-{
-    local pcount=$(wc -l $tPASS_FILE | awk '{print $1}')
-    local fcount=$(wc -l $tFAIL_FILE | awk '{print $1}')
-    local total=$(( $pcount + $fcount ))
-    echo "#################################Test Report###############################"
-    echo "TOTAL   : $total" 
-    echo "PASSED  : $pcount" 
-    echo "FAILED  : $fcount" 
-    cat $tPASS_FILE $tFAIL_FILE
-    echo "###########################End of running $0########################"
-#cleanup
-    rm -f $tPASS_FILE $tFAIL_FILE $tRETURN_FILE $tSTDERR_FILE 
-#   rm -rf $LXT_TMP_DIR
-	if [[ $pcount -eq 0 ]] && [[ $total -eq 0 ]];then
-	  exit 0
-    fi
-    test $pcount -eq 0 && exit 1
-    test $pcount -eq $total && exit 0 
-    exit 1
-}
-#
-# private function
-#
-#
-# print the error message and call stack. return 1
-#
-tfail_ ()
-{
-    local msg=$*
-    tlog "$msg" "ERROR" >>$tFAIL_FILE 
-    return 1
-}
-#
-# print the sucessful message. return 0
-#
-tpass_ ()
-{
-    local msg=$*
-    tlog "$msg" "PASS" >> $tPASS_FILE
-    return 0
-}
-_trun_ ()
-{
-    local cmd="$1"
-    local chk="$2"
-    local cur_date=$(tdate)
-    local stdout=$(eval "$cmd" 2>$tSTDERR_FILE; echo $? >$tRETURN_FILE 2>/dev/null)
-#timeout -- how to set timeout?
-    local exit_status=$(< $tRETURN_FILE)
-    local stderr=$(< $tSTDERR_FILE)
-    local msg=CMD
-#tnot
-    if test x$chk = x1; then
-        test $exit_status -eq 0 || msg=PASS
-        test $exit_status -eq 0 && msg=FAIL
-#should let the tester know this is the negative testing
-#if cmd return 0 we will return 1 and vice versa
-        cmd="[NOT] $cmd"
-    fi
-#tok
-    if test x$chk = x0; then
-        test $exit_status -eq 0 && msg=PASS
-        test $exit_status -eq 0 || msg=FAIL
-    fi
-    tSTDOUT=$stdout
-    tSTDERR=$stderr
-    test $tIGNORE_STDOUT -eq 1 && stdout='redirect the stdout to /dev/null' 
-    test $tIGNORE_STDERR -eq 1 && stderr='redirect the stderr to /dev/null' 
-    echo "[$msg][$cur_date][$HOSTNAME]$cmd" 
-    echo "STDOUT:"
-    test "x$stdout" = x || echo "$stdout"
-    echo "STDERR:$stderr"
-    echo "RETURN:$exit_status"
-    echo
-    return $exit_status
-}
-#
-# setup the testing environment
-#
-_tsetup_ ()
-{
-    LXT_TMP_DIR="/mnt/testarea/lxt";
-    test -z "$HOSTNAME" && HOSTNAME=$(hostname)
-    test -d "$LXT_TMP_DIR" || mkdir -p "$LXT_TMP_DIR" >& /dev/null || exit 1
-    tSTDERR_FILE="$LXT_TMP_DIR/stderr.$$"
-    test -e "$tSTDERR_FILE" || > "$tSTDERR_FILE" || exit 1
-    tRETURN_FILE="$LXT_TMP_DIR/return.$$"
-    test -e "$tRETURN_FILE" || > "$tRETURN_FILE" || exit 1
-    tPASS_FILE="$LXT_TMP_DIR/tc.pass.$$"
-    test -e "$tPASS_FILE" || > "$tPASS_FILE" || exit 1
-    tFAIL_FILE="$LXT_TMP_DIR/tc.fail.$$"
-    test -e "$tFAIL_FILE" || > "$tFAIL_FILE" || exit 1
-}
-#
-# main
-#
-# global variables
-tIGNORE_STDOUT=0
-tIGNORE_STDERR=0
-tSTDOUT=
-tSTDERR=
-#LXT_TMP_DIR
-# only used in this file
-tPASS_FILE=
-tFAIL_FILE=
-_tsetup_
diff --git a/tests/tests.yml b/tests/tests.yml
deleted file mode 100644
index 31fdc65..0000000
--- a/tests/tests.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-# No tests suitable for container environment
-# No tests suitable for atomic environment
-#
-# Tests suitable for classic environment
-- hosts: localhost
-  roles:
-  - role: standard-test-beakerlib
-    tags:
-    - classic
-    tests:
-     - sanity
-    required_packages:
-     - fcoe-utils
-     - libselinux-python