Skip to content

Commit ebafbd8

Browse files
tblumejohannbg
authored andcommitted
fix(dasd_rules): remove collect based udev rule creators
The collect binary has been removed, so the rules are broken
1 parent 35822f3 commit ebafbd8

File tree

1 file changed

+5
-40
lines changed

1 file changed

+5
-40
lines changed

modules.d/95dasd_rules/parse-dasd.sh

+5-40
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,22 @@
11
#!/bin/bash
22

3-
create_udev_rule() {
3+
allow_device() {
44
local ccw=$1
5-
local _drv _cu_type _dev_type
6-
local _rule="/etc/udev/rules.d/51-dasd-${ccw}.rules"
75

86
if [ -x /sbin/cio_ignore ] && cio_ignore -i "$ccw" > /dev/null; then
97
cio_ignore -r "$ccw"
108
fi
11-
12-
if [ -e /sys/bus/ccw/devices/"${ccw}" ]; then
13-
read -r _cu_type < /sys/bus/ccw/devices/"${ccw}"/cutype
14-
read -r _dev_type < /sys/bus/ccw/devices/"${ccw}"/devtype
15-
fi
16-
17-
case "$_cu_type" in
18-
3990/* | 2105/* | 2107/* | 1750/* | 9343/*)
19-
_drv=dasd-eckd
20-
;;
21-
6310/*)
22-
_drv=dasd-fba
23-
;;
24-
3880/*)
25-
case "$_dev_type" in
26-
3380/*)
27-
_drv=dasd_eckd
28-
;;
29-
3370/*)
30-
_drv=dasd-fba
31-
;;
32-
esac
33-
;;
34-
esac
35-
[ -z "${_drv}" ] && return 0
36-
37-
[ -e "${_rule}" ] && return 0
38-
39-
cat > "$_rule" << EOF
40-
ACTION=="add", SUBSYSTEM=="ccw", KERNEL=="$ccw", IMPORT{program}="collect $ccw %k ${ccw} $_drv"
41-
ACTION=="add", SUBSYSTEM=="drivers", KERNEL=="$_drv", IMPORT{program}="collect $ccw %k ${ccw} $_drv"
42-
ACTION=="add", ENV{COLLECT_$ccw}=="0", ATTR{[ccw/$ccw]online}="1"
43-
EOF
449
}
4510

4611
if [[ -f /sys/firmware/ipl/ipl_type ]] && [[ $(< /sys/firmware/ipl/ipl_type) == "ccw" ]]; then
47-
create_udev_rule "$(< /sys/firmware/ipl/device)"
12+
allow_device "$(< /sys/firmware/ipl/device)"
4813
fi
4914

5015
for dasd_arg in $(getargs root=) $(getargs resume=); do
5116
[[ $dasd_arg =~ /dev/disk/by-path/ccw-* ]] || continue
5217

5318
ccw_dev="${dasd_arg##*/ccw-}"
54-
create_udev_rule "${ccw_dev%%-*}"
19+
allow_device "${ccw_dev%%-*}"
5520
done
5621

5722
for dasd_arg in $(getargs rd.dasd=); do
@@ -66,12 +31,12 @@ for dasd_arg in $(getargs rd.dasd=); do
6631
prefix=${start%.*}
6732
start=${start##*.}
6833
for rdev in $(seq $((16#$start)) $((16#$end))); do
69-
create_udev_rule "$(printf "%s.%04x" "$prefix" "$rdev")"
34+
allow_device "$(printf "%s.%04x" "$prefix" "$rdev")"
7035
done
7136
;;
7237
*)
7338
IFS="." read -r sid ssid chan _ <<< "${dev%(ro)}"
74-
create_udev_rule "$(printf "%01x.%01x.%04x" $((16#$sid)) $((16#$ssid)) $((16#$chan)))"
39+
allow_device "$(printf "%01x.%01x.%04x" $((16#$sid)) $((16#$ssid)) $((16#$chan)))"
7540
;;
7641
esac
7742
done

0 commit comments

Comments
 (0)