From 299ea45dfab86356fc9f9f3db33348cf1a94061a Mon Sep 17 00:00:00 2001 From: root Date: Wed, 26 Jan 2022 07:35:40 +0100 Subject: [PATCH] daily autocommit --- .etckeeper | 2 +- .../snap-core-11798.mount | 1 - .../snap-core-12603.mount | 1 + ...core-11798.mount => snap-core-12603.mount} | 6 ++--- udev/rules.d/70-snap.core.rules | 22 ++++++++++++++++--- 5 files changed, 24 insertions(+), 8 deletions(-) delete mode 120000 systemd/system/multi-user.target.wants/snap-core-11798.mount create mode 120000 systemd/system/multi-user.target.wants/snap-core-12603.mount rename systemd/system/{snap-core-11798.mount => snap-core-12603.mount} (59%) diff --git a/.etckeeper b/.etckeeper index 4eb197b..e0e7a39 100755 --- a/.etckeeper +++ b/.etckeeper @@ -3030,8 +3030,8 @@ maybe chmod 0755 'systemd/system/remote-fs.target.wants' maybe chmod 0755 'systemd/system/rescue.target.wants' maybe chmod 0755 'systemd/system/sleep.target.wants' maybe chmod 0644 'systemd/system/snap-bare-5.mount' -maybe chmod 0644 'systemd/system/snap-core-11798.mount' maybe chmod 0644 'systemd/system/snap-core-11993.mount' +maybe chmod 0644 'systemd/system/snap-core-12603.mount' maybe chmod 0644 'systemd/system/snap-core18-2253.mount' maybe chmod 0644 'systemd/system/snap-core18-2284.mount' maybe chmod 0644 'systemd/system/snap-drawio-139.mount' diff --git a/systemd/system/multi-user.target.wants/snap-core-11798.mount b/systemd/system/multi-user.target.wants/snap-core-11798.mount deleted file mode 120000 index 3ddeeb9..0000000 --- a/systemd/system/multi-user.target.wants/snap-core-11798.mount +++ /dev/null @@ -1 +0,0 @@ -/etc/systemd/system/snap-core-11798.mount \ No newline at end of file diff --git a/systemd/system/multi-user.target.wants/snap-core-12603.mount b/systemd/system/multi-user.target.wants/snap-core-12603.mount new file mode 120000 index 0000000..34863b1 --- /dev/null +++ b/systemd/system/multi-user.target.wants/snap-core-12603.mount @@ -0,0 +1 @@ +/etc/systemd/system/snap-core-12603.mount \ No newline at end of file diff --git a/systemd/system/snap-core-11798.mount b/systemd/system/snap-core-12603.mount similarity index 59% rename from systemd/system/snap-core-11798.mount rename to systemd/system/snap-core-12603.mount index 88b28d9..df4d5b6 100644 --- a/systemd/system/snap-core-11798.mount +++ b/systemd/system/snap-core-12603.mount @@ -1,11 +1,11 @@ [Unit] -Description=Mount unit for core, revision 11798 +Description=Mount unit for core, revision 12603 Before=snapd.service After=zfs-mount.service [Mount] -What=/var/lib/snapd/snaps/core_11798.snap -Where=/snap/core/11798 +What=/var/lib/snapd/snaps/core_12603.snap +Where=/snap/core/12603 Type=squashfs Options=nodev,ro,x-gdu.hide,x-gvfs-hide LazyUnmount=yes diff --git a/udev/rules.d/70-snap.core.rules b/udev/rules.d/70-snap.core.rules index ca2c1da..908096f 100644 --- a/udev/rules.d/70-snap.core.rules +++ b/udev/rules.d/70-snap.core.rules @@ -983,12 +983,28 @@ LABEL="mm_zte_port_types_end" # that don't have this tag. MM will still get the udev 'add' event for the # device a short while later and then process it as normal. -ACTION!="add|change|move", GOTO="mm_candidate_end" +ACTION!="add|change|move|bind", GOTO="mm_candidate_end" + +# Opening bound but disconnected Bluetooth RFCOMM ttys would initiate the +# connection. Don't do that. +KERNEL=="rfcomm*", DEVPATH=="*/virtual/*", GOTO="mm_candidate_end" SUBSYSTEM=="tty", ENV{ID_MM_CANDIDATE}="1" SUBSYSTEM=="net", ENV{ID_MM_CANDIDATE}="1" -KERNEL=="cdc-wdm*", SUBSYSTEM=="usb", ENV{ID_MM_CANDIDATE}="1" -KERNEL=="cdc-wdm*", SUBSYSTEM=="usbmisc", ENV{ID_MM_CANDIDATE}="1" +KERNEL=="cdc-wdm[0-9]*", SUBSYSTEM=="usb", ENV{ID_MM_CANDIDATE}="1" +KERNEL=="cdc-wdm[0-9]*", SUBSYSTEM=="usbmisc", ENV{ID_MM_CANDIDATE}="1" + +# WWAN subsystem port handling +# - All USB devices ignored for now, only PCI devices expected +# - Only "wwan_port" device types processed (single ports); we fully ignore +# the "wwan_dev" device type (full device, not just one port) +SUBSYSTEMS=="usb", GOTO="mm_candidate_end" +SUBSYSTEM=="wwan", ENV{DEVTYPE}=="wwan_dev", GOTO="mm_candidate_end" +SUBSYSTEM=="wwan", ENV{ID_MM_CANDIDATE}="1" +SUBSYSTEM=="wwan", KERNEL=="*MBIM", ENV{ID_MM_PORT_TYPE_MBIM}="1" +SUBSYSTEM=="wwan", KERNEL=="*QMI", ENV{ID_MM_PORT_TYPE_QMI}="1" +SUBSYSTEM=="wwan", KERNEL=="*AT", ENV{ID_MM_PORT_TYPE_AT_PRIMARY}="1" +SUBSYSTEM=="wwan", KERNEL=="*QCDM", ENV{ID_MM_PORT_TYPE_QCDM}="1" LABEL="mm_candidate_end" -- 2.39.5