Browse Source

fix(s390_rules): drop collect installation

/usr/lib/udev/collect has been removed from udev-v246, so remove it
from the initrd too
master
Thomas Blume 4 years ago committed by Jóhann B. Guðmundsson
parent
commit
f905c3a72c
  1. 2
      modules.d/95dasd_rules/module-setup.sh
  2. 2
      modules.d/95qeth_rules/module-setup.sh
  3. 2
      modules.d/95zfcp_rules/module-setup.sh

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

@ -26,7 +26,6 @@ check() { @@ -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
@ -50,7 +49,6 @@ depends() { @@ -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

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

@ -5,7 +5,6 @@ check() { @@ -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 ]] && {
@ -56,5 +55,4 @@ install() { @@ -56,5 +55,4 @@ install() {
[ -n "$id" ] && inst_rules_qeth "$id"
done

inst_simple /usr/lib/udev/collect
}

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

@ -45,7 +45,6 @@ check() { @@ -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
@ -66,7 +65,6 @@ depends() { @@ -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

Loading…
Cancel
Save