From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 969EE1382C5 for ; Mon, 19 Feb 2018 09:45:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D547DE0A70; Mon, 19 Feb 2018 09:45:56 +0000 (UTC) Received: from mail-lf0-x244.google.com (mail-lf0-x244.google.com [IPv6:2a00:1450:4010:c07::244]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7DE6AE0A70 for ; Mon, 19 Feb 2018 09:45:56 +0000 (UTC) Received: by mail-lf0-x244.google.com with SMTP id v9so10183423lfa.11 for ; Mon, 19 Feb 2018 01:45:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=TUcQ7qr6oUwEbSIaq0AhIYXKHcKpqHTerqtiznpoOW8=; b=HCpWkHO8G9Gfmg9hb/5E0XMUvoVFy37i1Db0gX/M0Uzo6Gad2jbkR6TE9vbdhNOm/I xvyAk1kT1uWcAlA1Hr+dQPoWRYc75Zh0AHJCuFt/U8c2vsQdcmXTQlT3INtzr754HOwJ uvJqor/3gu+cqNRvNt1p3BnOXgrOs4vgPR3g9HABXFKGxm8cTtGE9VZrXtYtnH0IunW0 vtE/tvIxhH0VWlE1g+6fAGXq9GgwsWiy5OHxJRf7ySZcvI444Qar7t5YOD9rw0TIzo+0 ClPUHGSbpr2FFrnd+Ixt5/t+JlEO345SAEl+aLYv64t4axefEd1AS9X7Sd42gyWdTKSh mAFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=TUcQ7qr6oUwEbSIaq0AhIYXKHcKpqHTerqtiznpoOW8=; b=KDD7tzG31fSbNEfKIMJcLeAxc4jACH4xZuxNkvI2e54LHnFK7zu7Sn923aHB5K8SDr tgnwmdy7JRA2KOOUPy6ZZ241mgNhpWp3WYB+djReZkK7cu1H4WYW3NI/ysNdO90v+pwz F573/HcbyjeDz1iaORcgik/YK/sDcNd3F3ZO1dVhS/zYvHo6u1ZU2Ga0IbwTJ02HZiuR aJ9YYIxOBSa559D1fh6Ww+w6qCY6AnAm/BprjErxGvhwOUuCIz3TSUNWzrznu9Z2isLY DUEQnlTEhZxJmVycfbai6KGTgldPO68aF0bM0eFiQshRMLXXiK+ah2oUWCspYgmcnBfF IPnA== X-Gm-Message-State: APf1xPDur0dFX8xaRnV55QPlJKH3Wv6aYE2jGjUR1w7E1x2J4goz77eE D8PlYWPHmRFG/uuKXcRhWqWkwLcM X-Google-Smtp-Source: AH8x225zfJNKYyFZqz8zLWhoY7LinMJo+Re56xQh+cGxvQjdeW+lBgdELwEd8t6htlrkuu3/aanWhg== X-Received: by 10.46.17.211 with SMTP id 80mr8962513ljr.87.1519033554739; Mon, 19 Feb 2018 01:45:54 -0800 (PST) Received: from localhost.localdomain ([94.234.53.234]) by smtp.gmail.com with ESMTPSA id d24sm4989662lfc.95.2018.02.19.01.45.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Feb 2018 01:45:53 -0800 (PST) From: Marcus Folkesson To: eudev@lists.gentoo.org Cc: Marcus Folkesson Subject: [eudev] [PATCH v2 1/2] rules: update Date: Mon, 19 Feb 2018 10:45:39 +0100 Message-Id: <20180219094540.10595-1-marcus.folkesson@gmail.com> X-Mailer: git-send-email 2.15.1 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: eudev mailing list X-BeenThere: eudev@gentoo.org X-BeenThere: eudev@lists.gentoo.org X-Archives-Salt: f1c952ec-8168-4a52-bdd3-add2e6f96499 X-Archives-Hash: 18bc5e4804a6321648a6e7f0abf0fd31 Update to match systemd v235-1952-gba3182b91 Signed-off-by: Marcus Folkesson --- rules/50-udev-default.rules | 13 ++++++++++--- rules/60-input-id.rules | 8 ++++++++ rules/60-persistent-input.rules | 4 ++-- rules/60-persistent-storage.rules | 11 +++++++++-- rules/64-btrfs.rules | 3 +++ rules/70-joystick.rules | 12 ++++++++++++ rules/80-drivers.rules | 2 +- rules/80-net-setup-link.rules | 13 +++++++++++++ 8 files changed, 58 insertions(+), 8 deletions(-) create mode 100644 rules/60-input-id.rules create mode 100644 rules/70-joystick.rules create mode 100644 rules/80-net-setup-link.rules diff --git a/rules/50-udev-default.rules b/rules/50-udev-default.rules index 26445f2c8..191f56f42 100644 --- a/rules/50-udev-default.rules +++ b/rules/50-udev-default.rules @@ -11,7 +11,6 @@ SUBSYSTEM=="rtc", ATTR{hctosys}=="1", SYMLINK+="rtc" SUBSYSTEM=="rtc", KERNEL=="rtc0", SYMLINK+="rtc", OPTIONS+="link_priority=-100" SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", IMPORT{builtin}="usb_id", IMPORT{builtin}="hwdb --subsystem=usb" -SUBSYSTEM=="input", ENV{ID_INPUT}=="", IMPORT{builtin}="input_id" ENV{MODALIAS}!="", IMPORT{builtin}="hwdb --subsystem=$env{SUBSYSTEM}" ACTION!="add", GOTO="default_end" @@ -23,7 +22,7 @@ SUBSYSTEM=="tty", KERNEL=="sclp_line[0-9]*", GROUP="tty", MODE="0620" SUBSYSTEM=="tty", KERNEL=="ttysclp[0-9]*", GROUP="tty", MODE="0620" SUBSYSTEM=="tty", KERNEL=="3270/tty[0-9]*", GROUP="tty", MODE="0620" SUBSYSTEM=="vc", KERNEL=="vcs*|vcsa*", GROUP="tty" -KERNEL=="tty[A-Z]*[0-9]|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="dialout" +KERNEL=="tty[A-Z]*[0-9]|ttymxc[0-9]*|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="dialout" SUBSYSTEM=="mem", KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640" @@ -32,11 +31,14 @@ SUBSYSTEM=="input", KERNEL=="js[0-9]*", MODE="0664" SUBSYSTEM=="video4linux", GROUP="video" SUBSYSTEM=="graphics", GROUP="video" -SUBSYSTEM=="drm", GROUP="video" +SUBSYSTEM=="drm", KERNEL!="renderD*", GROUP="video" SUBSYSTEM=="dvb", GROUP="video" SUBSYSTEM=="media", GROUP="video" SUBSYSTEM=="cec", GROUP="video" +SUBSYSTEM=="drm", KERNEL=="renderD*", GROUP="render", MODE="@GROUP_RENDER_MODE@" +SUBSYSTEM=="kfd", GROUP="render", MODE="@GROUP_RENDER_MODE@" + SUBSYSTEM=="sound", GROUP="audio", \ OPTIONS+="static_node=snd/seq", OPTIONS+="static_node=snd/timer" @@ -76,4 +78,9 @@ KERNEL=="tun", MODE="0666", OPTIONS+="static_node=net/tun" KERNEL=="fuse", MODE="0666", OPTIONS+="static_node=fuse" +# The static_node is required on s390x and ppc (they are using MODULE_ALIAS) +KERNEL=="kvm", GROUP="kvm", MODE="@DEV_KVM_MODE@", OPTIONS+="static_node=kvm" + +SUBSYSTEM=="ptp", ATTR{clock_name}=="KVM virtual PTP", SYMLINK += "ptp_kvm" + LABEL="default_end" diff --git a/rules/60-input-id.rules b/rules/60-input-id.rules new file mode 100644 index 000000000..bb8a812d1 --- /dev/null +++ b/rules/60-input-id.rules @@ -0,0 +1,8 @@ +# do not edit this file, it will be overwritten on update + +ACTION=="remove", GOTO="id_input_end" + +SUBSYSTEM=="input", ENV{ID_INPUT}=="", IMPORT{builtin}="input_id" +SUBSYSTEM=="input", IMPORT{builtin}="hwdb --subsystem=input --lookup-prefix=id-input:modalias:" + +LABEL="id_input_end" diff --git a/rules/60-persistent-input.rules b/rules/60-persistent-input.rules index 91efbe729..255547d90 100644 --- a/rules/60-persistent-input.rules +++ b/rules/60-persistent-input.rules @@ -5,8 +5,8 @@ SUBSYSTEM!="input", GOTO="persistent_input_end" SUBSYSTEMS=="bluetooth", ENV{ID_BUS}="bluetooth", GOTO="persistent_input_end" # Bluetooth devices don't always have the bluetooth subsystem ATTRS{id/bustype}=="0005", ENV{ID_BUS}="bluetooth", GOTO="persistent_input_end" -SUBSYSTEMS=="rmi4", ENV{ID_BUS}="rmi", GOTO="persistent_input_end" -SUBSYSTEMS=="serio", ENV{ID_BUS}="i8042", GOTO="persistent_input_end" +SUBSYSTEMS=="rmi4", ENV{ID_BUS}="rmi" +SUBSYSTEMS=="serio", ENV{ID_BUS}="i8042" SUBSYSTEMS=="usb", ENV{ID_BUS}=="", IMPORT{builtin}="usb_id" diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules index d2745f65f..0de8cf3a1 100644 --- a/rules/60-persistent-storage.rules +++ b/rules/60-persistent-storage.rules @@ -21,10 +21,14 @@ KERNEL=="nvme*[0-9]n*[0-9]p*[0-9]", ENV{DEVTYPE}=="partition", ATTRS{wwid}=="?*" KERNEL=="nvme*[0-9]n*[0-9]", ENV{DEVTYPE}=="disk", ATTRS{serial}=="?*", ENV{ID_SERIAL_SHORT}="$attr{serial}" KERNEL=="nvme*[0-9]n*[0-9]", ENV{DEVTYPE}=="disk", ATTRS{wwid}=="?*", ENV{ID_WWN}="$attr{wwid}" -KERNEL=="nvme*[0-9]n*[0-9]", ENV{DEVTYPE}=="disk", ATTRS{model}=="?*", ENV{ID_SERIAL_SHORT}=="?*", ENV{ID_SERIAL}="$attr{model}_$env{ID_SERIAL_SHORT}", SYMLINK+="disk/by-id/nvme-$env{ID_SERIAL}" +KERNEL=="nvme*[0-9]n*[0-9]", ENV{DEVTYPE}=="disk", ATTRS{model}=="?*", ENV{ID_MODEL}="$attr{model}" +KERNEL=="nvme*[0-9]n*[0-9]", ENV{DEVTYPE}=="disk", ENV{ID_MODEL}=="?*", ENV{ID_SERIAL_SHORT}=="?*", \ + ENV{ID_SERIAL}="$env{ID_MODEL}_$env{ID_SERIAL_SHORT}", SYMLINK+="disk/by-id/nvme-$env{ID_SERIAL}" KERNEL=="nvme*[0-9]n*[0-9]p*[0-9]", ENV{DEVTYPE}=="partition", ATTRS{serial}=="?*", ENV{ID_SERIAL_SHORT}="$attr{serial}" -KERNEL=="nvme*[0-9]n*[0-9]p*[0-9]", ENV{DEVTYPE}=="partition", ATTRS{model}=="?*", ENV{ID_SERIAL_SHORT}=="?*", ENV{ID_SERIAL}="$attr{model}_$env{ID_SERIAL_SHORT}", SYMLINK+="disk/by-id/nvme-$env{ID_SERIAL}-part%n" +KERNEL=="nvme*[0-9]n*[0-9]p*[0-9]", ENV{DEVTYPE}=="partition", ATTRS{model}=="?*", ENV{ID_MODEL}="$attr{model}" +KERNEL=="nvme*[0-9]n*[0-9]p*[0-9]", ENV{DEVTYPE}=="partition", ENV{ID_MODEL}=="?*", ENV{ID_SERIAL_SHORT}=="?*", \ + ENV{ID_SERIAL}="$env{ID_MODEL}_$env{ID_SERIAL_SHORT}", SYMLINK+="disk/by-id/nvme-$env{ID_SERIAL}-part%n" # virtio-blk KERNEL=="vd*[!0-9]", ATTRS{serial}=="?*", ENV{ID_SERIAL}="$attr{serial}", SYMLINK+="disk/by-id/virtio-$env{ID_SERIAL}" @@ -57,6 +61,9 @@ KERNEL=="mmcblk[0-9]", SUBSYSTEMS=="mmc", ATTRS{name}=="?*", ATTRS{serial}=="?*" ENV{ID_NAME}="$attr{name}", ENV{ID_SERIAL}="$attr{serial}", SYMLINK+="disk/by-id/mmc-$env{ID_NAME}_$env{ID_SERIAL}" KERNEL=="mmcblk[0-9]p[0-9]*", ENV{ID_NAME}=="?*", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/mmc-$env{ID_NAME}_$env{ID_SERIAL}-part%n" +# UBI-MTD +SUBSYSTEM=="ubi", KERNEL=="ubi*_*", ATTRS{mtd_num}=="*", SYMLINK+="ubi_mtd%s{mtd_num}_%s{name}" + # Memstick KERNEL=="msblk[0-9]|mspblk[0-9]", SUBSYSTEMS=="memstick", ATTRS{name}=="?*", ATTRS{serial}=="?*", \ ENV{ID_NAME}="$attr{name}", ENV{ID_SERIAL}="$attr{serial}", SYMLINK+="disk/by-id/memstick-$env{ID_NAME}_$env{ID_SERIAL}" diff --git a/rules/64-btrfs.rules b/rules/64-btrfs.rules index fe0100131..c3a0972f2 100644 --- a/rules/64-btrfs.rules +++ b/rules/64-btrfs.rules @@ -10,4 +10,7 @@ IMPORT{builtin}="btrfs ready $devnode" # mark the device as not ready to be used by the system ENV{ID_BTRFS_READY}=="0", ENV{SYSTEMD_READY}="0" +# reconsider pending devices in case when multidevice volume awaits +ENV{ID_BTRFS_READY}=="1", RUN+="@rootbindir@/udevadm trigger -s block -p ID_BTRFS_READY=0" + LABEL="btrfs_end" diff --git a/rules/70-joystick.rules b/rules/70-joystick.rules new file mode 100644 index 000000000..b80d20367 --- /dev/null +++ b/rules/70-joystick.rules @@ -0,0 +1,12 @@ +# do not edit this file, it will be overwritten on update + +ACTION=="remove", GOTO="joystick_end" +ENV{ID_INPUT_JOYSTICK}=="", GOTO="joystick_end" +KERNEL!="event*", GOTO="joystick_end" + +# joystick::vp:name::* +KERNELS=="input*", ENV{ID_BUS}!="", \ + IMPORT{builtin}="hwdb 'joystick:$env{ID_BUS}:v$attr{id/vendor}p$attr{id/product}:name:$attr{name}:'", \ + GOTO="joystick_end" + +LABEL="joystick_end" diff --git a/rules/80-drivers.rules b/rules/80-drivers.rules index 8551f47a4..16fa5d8e3 100644 --- a/rules/80-drivers.rules +++ b/rules/80-drivers.rules @@ -1,6 +1,6 @@ # do not edit this file, it will be overwritten on update -ACTION=="remove", GOTO="drivers_end" +ACTION!="add", GOTO="drivers_end" ENV{MODALIAS}=="?*", RUN{builtin}+="kmod load $env{MODALIAS}" SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", RUN{builtin}+="kmod load tifm_sd" diff --git a/rules/80-net-setup-link.rules b/rules/80-net-setup-link.rules new file mode 100644 index 000000000..6e411a91f --- /dev/null +++ b/rules/80-net-setup-link.rules @@ -0,0 +1,13 @@ +# do not edit this file, it will be overwritten on update + +SUBSYSTEM!="net", GOTO="net_setup_link_end" + +IMPORT{builtin}="path_id" + +ACTION!="add", GOTO="net_setup_link_end" + +IMPORT{builtin}="net_setup_link" + +NAME=="", ENV{ID_NET_NAME}!="", NAME="$env{ID_NET_NAME}" + +LABEL="net_setup_link_end" -- 2.15.1