130 lines
5.0 KiB
Diff
130 lines
5.0 KiB
Diff
From 38a3ee547e93c0b11020818cc4a244f89d492031 Mon Sep 17 00:00:00 2001
|
|
From: luck <lucx_ii@163.com>
|
|
Date: Sun, 4 Dec 2022 16:00:32 +0800
|
|
Subject: [PATCH] remove iscsi-related code since it is no longer maintained by
|
|
open-iscsi
|
|
|
|
---
|
|
modules.d/95iscsi/cleanup-iscsi.sh | 3 ---
|
|
modules.d/95iscsi/iscsiroot.sh | 8 -------
|
|
modules.d/95iscsi/module-setup.sh | 29 +++--------------------
|
|
test/container/Dockerfile-OpenSuse-latest | 2 +-
|
|
4 files changed, 4 insertions(+), 38 deletions(-)
|
|
|
|
diff --git a/modules.d/95iscsi/cleanup-iscsi.sh b/modules.d/95iscsi/cleanup-iscsi.sh
|
|
index 8338503..13f4793 100755
|
|
--- a/modules.d/95iscsi/cleanup-iscsi.sh
|
|
+++ b/modules.d/95iscsi/cleanup-iscsi.sh
|
|
@@ -1,5 +1,2 @@
|
|
#!/bin/sh
|
|
|
|
-if [ -z "${DRACUT_SYSTEMD}" ] && { [ -e /sys/module/bnx2i ] || [ -e /sys/module/qedi ]; }; then
|
|
- killproc iscsiuio
|
|
-fi
|
|
diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh
|
|
index b6af7f4..39c5f6d 100755
|
|
--- a/modules.d/95iscsi/iscsiroot.sh
|
|
+++ b/modules.d/95iscsi/iscsiroot.sh
|
|
@@ -36,14 +36,6 @@ iroot=${iroot#:}
|
|
# figured out a way how to check whether this is built-in or not
|
|
modprobe crc32c 2> /dev/null
|
|
|
|
-# start iscsiuio if needed
|
|
-if [ -z "${DRACUT_SYSTEMD}" ] \
|
|
- && { [ -e /sys/module/bnx2i ] || [ -e /sys/module/qedi ]; } \
|
|
- && ! [ -e /tmp/iscsiuio-started ]; then
|
|
- iscsiuio
|
|
- : > /tmp/iscsiuio-started
|
|
-fi
|
|
-
|
|
handle_firmware() {
|
|
local ifaces retry _res
|
|
|
|
diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh
|
|
index e7d74fe..dcb6eea 100755
|
|
--- a/modules.d/95iscsi/module-setup.sh
|
|
+++ b/modules.d/95iscsi/module-setup.sh
|
|
@@ -185,7 +185,6 @@ cmdline() {
|
|
|
|
# called by dracut
|
|
install() {
|
|
- inst_multiple -o iscsiuio
|
|
inst_libdir_file 'libgcc_s.so*'
|
|
inst_multiple umount iscsi-iname iscsiadm iscsid
|
|
inst_binary sort
|
|
@@ -193,10 +192,7 @@ install() {
|
|
inst_multiple -o \
|
|
"$systemdsystemunitdir"/iscsid.socket \
|
|
"$systemdsystemunitdir"/iscsid.service \
|
|
- "$systemdsystemunitdir"/iscsiuio.service \
|
|
- "$systemdsystemunitdir"/iscsiuio.socket \
|
|
- "$systemdsystemunitdir"/sockets.target.wants/iscsid.socket \
|
|
- "$systemdsystemunitdir"/sockets.target.wants/iscsiuio.socket
|
|
+ "$systemdsystemunitdir"/sockets.target.wants/iscsid.socket
|
|
|
|
if [[ $hostonly ]]; then
|
|
local -a _filenames
|
|
@@ -227,13 +223,10 @@ install() {
|
|
"$systemdsystemunitdir"/iscsi-init.service \
|
|
"$systemdsystemunitdir"/iscsid.service \
|
|
"$systemdsystemunitdir"/iscsid.socket \
|
|
- "$systemdsystemunitdir"/iscsiuio.service \
|
|
- "$systemdsystemunitdir"/iscsiuio.socket \
|
|
iscsiadm iscsid
|
|
|
|
for i in \
|
|
- iscsid.socket \
|
|
- iscsiuio.socket; do
|
|
+ iscsid.socket; do
|
|
$SYSTEMCTL -q --root "$initdir" enable "$i"
|
|
done
|
|
|
|
@@ -253,22 +246,6 @@ install() {
|
|
echo "Before=shutdown.target sockets.target"
|
|
} > "${initdir}/$systemdsystemunitdir/iscsid.socket.d/dracut.conf"
|
|
|
|
- mkdir -p "${initdir}/$systemdsystemunitdir/iscsiuio.service.d"
|
|
- {
|
|
- echo "[Unit]"
|
|
- echo "DefaultDependencies=no"
|
|
- echo "Conflicts=shutdown.target"
|
|
- echo "Before=shutdown.target"
|
|
- } > "${initdir}/$systemdsystemunitdir/iscsiuio.service.d/dracut.conf"
|
|
-
|
|
- mkdir -p "${initdir}/$systemdsystemunitdir/iscsiuio.socket.d"
|
|
- {
|
|
- echo "[Unit]"
|
|
- echo "DefaultDependencies=no"
|
|
- echo "Conflicts=shutdown.target"
|
|
- echo "Before=shutdown.target sockets.target"
|
|
- } > "${initdir}/$systemdsystemunitdir/iscsiuio.socket.d/dracut.conf"
|
|
-
|
|
# Fedora 34 iscsid requires iscsi-shutdown.service
|
|
# which would terminate all iSCSI connections on switch root
|
|
cat > "${initdir}/$systemdsystemunitdir/iscsi-shutdown.service" << EOF
|
|
@@ -277,7 +254,7 @@ Description=Dummy iscsi-shutdown.service for the initrd
|
|
Documentation=man:iscsid(8) man:iscsiadm(8)
|
|
DefaultDependencies=no
|
|
Conflicts=shutdown.target
|
|
-After=systemd-remount-fs.service network.target iscsid.service iscsiuio.service
|
|
+After=systemd-remount-fs.service network.target iscsid.service
|
|
Before=remote-fs-pre.target
|
|
|
|
[Service]
|
|
diff --git a/test/container/Dockerfile-OpenSuse-latest b/test/container/Dockerfile-OpenSuse-latest
|
|
index 9007865..32dd8b1 100644
|
|
--- a/test/container/Dockerfile-OpenSuse-latest
|
|
+++ b/test/container/Dockerfile-OpenSuse-latest
|
|
@@ -13,7 +13,7 @@ RUN dnf -y install --setopt=install_weak_deps=False \
|
|
strace libkmod-devel gcc bzip2 xz tar wget rpm-build make git bash-completion \
|
|
sudo kernel dhcp-client qemu-kvm /usr/bin/qemu-system-$(uname -m) e2fsprogs \
|
|
tcpdump iproute iputils kbd NetworkManager btrfsprogs tgt dbus-broker \
|
|
- iscsiuio open-iscsi which ShellCheck shfmt procps pigz parted squashfs ntfsprogs \
|
|
+ open-iscsi which ShellCheck shfmt procps pigz parted squashfs ntfsprogs \
|
|
&& dnf -y remove dracut && dnf -y update && dnf clean all
|
|
|
|
# Set default command
|
|
--
|
|
2.27.0
|
|
|