From 10efffebaaa4ec8af02fc2d52f456df225f324c9 Mon Sep 17 00:00:00 2001 From: Lin Liu Date: Wed, 11 Dec 2024 01:50:38 +0000 Subject: [PATCH] CP-50546: Remove early-blacklist Signed-off-by: Lin Liu --- Makefile | 6 +++--- startup/early-blacklist | 14 -------------- startup/early-blacklist.conf | 14 -------------- startup/early-blacklist.service | 9 --------- 4 files changed, 3 insertions(+), 40 deletions(-) delete mode 100644 startup/early-blacklist delete mode 100644 startup/early-blacklist.conf delete mode 100644 startup/early-blacklist.service diff --git a/Makefile b/Makefile index ed327344..e5551280 100644 --- a/Makefile +++ b/Makefile @@ -63,15 +63,15 @@ install: $(DESTDIR)/etc/dracut.conf.d \ $(DESTDIR)/etc/systemd/system/systemd-udevd.d - $(INSTALL) -m755 startup/interface-rename-sideway startup/early-blacklist $(DESTDIR)/$(INSTALLER_DIR) + $(INSTALL) -m755 startup/interface-rename-sideway $(DESTDIR)/$(INSTALLER_DIR) $(INSTALL) -m644 startup/functions $(DESTDIR)/$(INSTALLER_DIR) - $(INSTALL) -m644 startup/early-blacklist.conf startup/bnx2x.conf $(DESTDIR)/etc/modprobe.d/ + $(INSTALL) -m644 startup/bnx2x.conf $(DESTDIR)/etc/modprobe.d/ $(INSTALL) -m644 startup/blacklist $(DESTDIR)/etc/modprobe.d/installer-blacklist.conf $(INSTALL) -m644 startup/modprobe.mlx4 $(DESTDIR)/etc/modprobe.d/mlx4.conf $(INSTALL) -m644 startup/iscsi-modules $(DESTDIR)/etc/modules-load.d/iscsi.conf $(INSTALL) -m755 startup/preinit startup/S05ramdisk $(DESTDIR)/$(INSTALLER_DIR)/ $(INSTALL) -m644 startup/systemd-udevd_depmod.conf $(DESTDIR)/etc/systemd/system/systemd-udevd.d/installer.conf - $(INSTALL) -m644 startup/early-blacklist.service startup/interface-rename-sideway.service $(DESTDIR)/$(SERVICE_DIR) + $(INSTALL) -m644 startup/interface-rename-sideway.service $(DESTDIR)/$(SERVICE_DIR) # Generate a multipath configuration from sm's copy, removing # the blacklist and blacklist_exception sections. diff --git a/startup/early-blacklist b/startup/early-blacklist deleted file mode 100644 index 0651c9ac..00000000 --- a/startup/early-blacklist +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# -# early-blacklist: disable some module blacklisting -# - -udevadm trigger -udevadm settle --timeout=180 - -# enable all devices and discover again -echo -n '.' -rm -f /etc/modprobe.d/early-blacklist.conf -udevadm control --reload -udevadm trigger -udevadm settle --timeout=180 diff --git a/startup/early-blacklist.conf b/startup/early-blacklist.conf deleted file mode 100644 index 469cefe4..00000000 --- a/startup/early-blacklist.conf +++ /dev/null @@ -1,14 +0,0 @@ - -# blacklist to prevent fibre channel disks -blacklist bfa -blacklist lpfc -blacklist qla2xxx -blacklist qla4xxx -blacklist fnic -blacklist csiostor - -# prevent USB disks -blacklist ohci_hcd -blacklist uhci_hcd -blacklist ehci_pci -blacklist xhci_hcd diff --git a/startup/early-blacklist.service b/startup/early-blacklist.service deleted file mode 100644 index 8783336b..00000000 --- a/startup/early-blacklist.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Enable some devices previously disabled -Before=multi-user.target -Before=graphical.target - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=/opt/xensource/installer/early-blacklist