Skip to content

Commit

Permalink
fix(s390_rules): drop collect installation
Browse files Browse the repository at this point in the history
/usr/lib/udev/collect has been removed from udev-v246, so remove it
from the initrd too
  • Loading branch information
tblume authored and johannbg committed Nov 22, 2021
1 parent 75ad269 commit f905c3a
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 6 deletions.
2 changes: 0 additions & 2 deletions modules.d/95dasd_rules/module-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ check() {
local found=0
local bdev
[ "$_arch" = "s390" -o "$_arch" = "s390x" ] || return 1
require_binaries /usr/lib/udev/collect || return 1

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

# called by dracut
install() {
inst_multiple /usr/lib/udev/collect
inst_hook cmdline 30 "$moddir/parse-dasd.sh"
if [[ $hostonly_cmdline == "yes" ]]; then
local _dasd
Expand Down
2 changes: 0 additions & 2 deletions modules.d/95qeth_rules/module-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ check() {
local _arch=${DRACUT_ARCH:-$(uname -m)}
local _online=0
[ "$_arch" = "s390" -o "$_arch" = "s390x" ] || return 1
require_binaries /usr/lib/udev/collect || return 1
dracut_module_included network || return 1

[[ $hostonly ]] && {
Expand Down Expand Up @@ -56,5 +55,4 @@ install() {
[ -n "$id" ] && inst_rules_qeth "$id"
done

inst_simple /usr/lib/udev/collect
}
2 changes: 0 additions & 2 deletions modules.d/95zfcp_rules/module-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ check() {
local _arch=${DRACUT_ARCH:-$(uname -m)}
local _ccw
[ "$_arch" = "s390" -o "$_arch" = "s390x" ] || return 1
require_binaries /usr/lib/udev/collect || return 1

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

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

0 comments on commit f905c3a

Please sign in to comment.