1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
|
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
related commit:https://gitee.com/src-openeuler/open-iscsi/pulls/85/files
---
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 1a64465..a045af5 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
diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh
index 88d6c92..41fbc7d 100755
--- a/modules.d/95iscsi/module-setup.sh
+++ b/modules.d/95iscsi/module-setup.sh
@@ -185,17 +185,13 @@ cmdline() {
# called by dracut
install() {
- inst_multiple -o iscsiuio
inst_libdir_file 'libgcc_s.so*'
inst_multiple umount iscsi-iname iscsiadm iscsid
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
@@ -226,13 +222,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
@@ -252,22 +245,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
@@ -276,7 +253,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 637d50c..42de0ea 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 procps pigz \
+ open-iscsi which ShellCheck procps pigz \
&& dnf -y update && dnf clean all
RUN shfmt_version=3.2.4; wget "https://github.com/mvdan/sh/releases/download/v${shfmt_version}/shfmt_v${shfmt_version}_linux_amd64" -O /usr/local/bin/shfmt \
--
2.33.0
|
