Skip to content

Commit f905c3a

Browse files
tblumejohannbg
authored andcommitted
fix(s390_rules): drop collect installation
/usr/lib/udev/collect has been removed from udev-v246, so remove it from the initrd too
1 parent 75ad269 commit f905c3a

File tree

3 files changed

+0
-6
lines changed

3 files changed

+0
-6
lines changed

modules.d/95dasd_rules/module-setup.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ check() {
2626
local found=0
2727
local bdev
2828
[ "$_arch" = "s390" -o "$_arch" = "s390x" ] || return 1
29-
require_binaries /usr/lib/udev/collect || return 1
3029

3130
[[ $hostonly ]] || [[ $mount_needs ]] && {
3231
for bdev in /sys/block/*; do
@@ -50,7 +49,6 @@ depends() {
5049

5150
# called by dracut
5251
install() {
53-
inst_multiple /usr/lib/udev/collect
5452
inst_hook cmdline 30 "$moddir/parse-dasd.sh"
5553
if [[ $hostonly_cmdline == "yes" ]]; then
5654
local _dasd

modules.d/95qeth_rules/module-setup.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ check() {
55
local _arch=${DRACUT_ARCH:-$(uname -m)}
66
local _online=0
77
[ "$_arch" = "s390" -o "$_arch" = "s390x" ] || return 1
8-
require_binaries /usr/lib/udev/collect || return 1
98
dracut_module_included network || return 1
109

1110
[[ $hostonly ]] && {
@@ -56,5 +55,4 @@ install() {
5655
[ -n "$id" ] && inst_rules_qeth "$id"
5756
done
5857

59-
inst_simple /usr/lib/udev/collect
6058
}

modules.d/95zfcp_rules/module-setup.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ check() {
4545
local _arch=${DRACUT_ARCH:-$(uname -m)}
4646
local _ccw
4747
[ "$_arch" = "s390" -o "$_arch" = "s390x" ] || return 1
48-
require_binaries /usr/lib/udev/collect || return 1
4948

5049
[[ $hostonly ]] || [[ $mount_needs ]] && {
5150
found=0
@@ -66,7 +65,6 @@ depends() {
6665

6766
# called by dracut
6867
install() {
69-
inst_multiple /usr/lib/udev/collect
7068
inst_hook cmdline 30 "$moddir/parse-zfcp.sh"
7169
if [[ $hostonly_cmdline == "yes" ]]; then
7270
local _zfcp

0 commit comments

Comments
 (0)