saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index 45ae067dfbdee6996f54ab3bd9f5ec69ae13c36d..6bafe34a48ddf17c1509ad977e6e38f88af18535 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -3037,12 +3037,12 @@ 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-12834.mount'
 maybe chmod 0644 'systemd/system/snap-core-13250.mount'
+maybe chmod 0644 'systemd/system/snap-core-13308.mount'
 maybe chmod 0644 'systemd/system/snap-core18-2344.mount'
 maybe chmod 0644 'systemd/system/snap-core18-2409.mount'
-maybe chmod 0644 'systemd/system/snap-drawio-157.mount'
 maybe chmod 0644 'systemd/system/snap-drawio-158.mount'
+maybe chmod 0644 'systemd/system/snap-drawio-159.mount'
 maybe chmod 0644 'systemd/system/snap-ferdi-211.mount'
 maybe chmod 0644 'systemd/system/snap-ferdi-225.mount'
 maybe chmod 0644 'systemd/system/snap-gnome\x2d3\x2d28\x2d1804-161.mount'

diff --git a/resolv.conf b/resolv.conf
index 9a0c1ae7a186d63f4d7592b48f292a64953cefd2..c3eb8f044b0d68768ab957c6e675d3913c3e6caf 100644 (file)
--- a/resolv.conf
+++ b/resolv.conf
@@ -1,5 +1,6 @@
-search pixelpark.net pixelpark.com pixelpark.de brehm-online.com uhu-banane.net pp-dns.com
-nameserver 77.74.232.24
-nameserver 77.74.232.25
-nameserver 93.188.104.82
+search home.brehm-online.com brehm-online.com hennig-berlin.org uhu-banane.de uhu-banane.net
+nameserver 127.0.0.1
+nameserver 1.1.1.1
+nameserver 8.8.8.8
+nameserver 8.8.4.4
 options timeout:1 attempts:2 use-vc

diff --git a/systemd/system/multi-user.target.wants/snap-core-12834.mount b/systemd/system/multi-user.target.wants/snap-core-12834.mount
deleted file mode 120000 (symlink)
index 6f2ab93..0000000
--- a/systemd/system/multi-user.target.wants/snap-core-12834.mount
+++ /dev/null
@@ -1 +0,0 @@
-/etc/systemd/system/snap-core-12834.mount
\ No newline at end of file

diff --git a/systemd/system/multi-user.target.wants/snap-core-13308.mount b/systemd/system/multi-user.target.wants/snap-core-13308.mount
new file mode 120000 (symlink)
index 0000000..fa58e8d
--- /dev/null
+++ b/systemd/system/multi-user.target.wants/snap-core-13308.mount
@@ -0,0 +1 @@
+/etc/systemd/system/snap-core-13308.mount
\ No newline at end of file

diff --git a/systemd/system/multi-user.target.wants/snap-drawio-157.mount b/systemd/system/multi-user.target.wants/snap-drawio-157.mount
deleted file mode 120000 (symlink)
index 2975c2d..0000000
--- a/systemd/system/multi-user.target.wants/snap-drawio-157.mount
+++ /dev/null
@@ -1 +0,0 @@
-/etc/systemd/system/snap-drawio-157.mount
\ No newline at end of file

diff --git a/systemd/system/multi-user.target.wants/snap-drawio-159.mount b/systemd/system/multi-user.target.wants/snap-drawio-159.mount
new file mode 120000 (symlink)
index 0000000..f86abb4
--- /dev/null
+++ b/systemd/system/multi-user.target.wants/snap-drawio-159.mount
@@ -0,0 +1 @@
+/etc/systemd/system/snap-drawio-159.mount
\ No newline at end of file

diff --git a/systemd/system/snap-core-12834.mount b/systemd/system/snap-core-12834.mount
deleted file mode 100644 (file)
index 84d5f78..0000000
--- a/systemd/system/snap-core-12834.mount
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Mount unit for core, revision 12834
-Before=snapd.service
-After=zfs-mount.service
-
-[Mount]
-What=/var/lib/snapd/snaps/core_12834.snap
-Where=/snap/core/12834
-Type=squashfs
-Options=nodev,ro,x-gdu.hide,x-gvfs-hide
-LazyUnmount=yes
-
-[Install]
-WantedBy=multi-user.target

diff --git a/systemd/system/snap-core-13308.mount b/systemd/system/snap-core-13308.mount
new file mode 100644 (file)
index 0000000..04cf778
--- /dev/null
+++ b/systemd/system/snap-core-13308.mount
@@ -0,0 +1,14 @@
+[Unit]
+Description=Mount unit for core, revision 13308
+Before=snapd.service
+After=zfs-mount.service
+
+[Mount]
+What=/var/lib/snapd/snaps/core_13308.snap
+Where=/snap/core/13308
+Type=squashfs
+Options=nodev,ro,x-gdu.hide,x-gvfs-hide
+LazyUnmount=yes
+
+[Install]
+WantedBy=multi-user.target

diff --git a/systemd/system/snap-drawio-157.mount b/systemd/system/snap-drawio-157.mount
deleted file mode 100644 (file)
index 992e41b..0000000
--- a/systemd/system/snap-drawio-157.mount
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Mount unit for drawio, revision 157
-Before=snapd.service
-After=zfs-mount.service
-
-[Mount]
-What=/var/lib/snapd/snaps/drawio_157.snap
-Where=/snap/drawio/157
-Type=squashfs
-Options=nodev,ro,x-gdu.hide,x-gvfs-hide
-LazyUnmount=yes
-
-[Install]
-WantedBy=multi-user.target

diff --git a/systemd/system/snap-drawio-159.mount b/systemd/system/snap-drawio-159.mount
new file mode 100644 (file)
index 0000000..b742cda
--- /dev/null
+++ b/systemd/system/snap-drawio-159.mount
@@ -0,0 +1,14 @@
+[Unit]
+Description=Mount unit for drawio, revision 159
+Before=snapd.service
+After=zfs-mount.service
+
+[Mount]
+What=/var/lib/snapd/snaps/drawio_159.snap
+Where=/snap/drawio/159
+Type=squashfs
+Options=nodev,ro,x-gdu.hide,x-gvfs-hide
+LazyUnmount=yes
+
+[Install]
+WantedBy=multi-user.target

diff --git a/udev/rules.d/70-snap.core.rules b/udev/rules.d/70-snap.core.rules
index 908096f8e04e48c754f8f8dbcef1d8bf33db994d..8336de089e4442a85e7b66c2b87f1fc0ee1b5418 100644 (file)
--- a/udev/rules.d/70-snap.core.rules
+++ b/udev/rules.d/70-snap.core.rules
@@ -3,13 +3,73 @@
 # Concatenation of all ModemManager udev rules
 # do not edit this file, it will be overwritten on update
 
-ACTION!="add|change|move", GOTO="mm_cinterion_port_types_end"
-SUBSYSTEM!="tty", GOTO="mm_cinterion_port_types_end"
-ENV{ID_VENDOR_ID}!="1e2d", GOTO="mm_cinterion_port_types_end"
+ACTION!="add|change|move|bind", GOTO="mm_cinterion_port_types_end"
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="1e2d", GOTO="mm_cinterion_port_types"
+GOTO="mm_cinterion_port_types_end"
 
+LABEL="mm_cinterion_port_types"
 SUBSYSTEMS=="usb", ATTRS{bInterfaceNumber}=="?*", ENV{.MM_USBIFNUM}="$attr{bInterfaceNumber}"
 
-ATTRS{idVendor}=="1e2d", ATTRS{idProduct}=="0053", ENV{.MM_USBIFNUM}=="01", ENV{ID_MM_CINTERION_PORT_TYPE_GPS}="1"
+# PHS8
+ATTRS{idVendor}=="1e2d", ATTRS{idProduct}=="0053", ENV{.MM_USBIFNUM}=="01", SUBSYSTEM=="tty", ENV{ID_MM_PORT_TYPE_GPS}="1"
+
+# PLS8 port types
+#  ttyACM0 (if #0): AT port
+#  ttyACM1 (if #2): AT port
+#  ttyACM2 (if #4): GPS data port
+#  ttyACM3 (if #6): unknown
+#  ttyACM4 (if #8): unknown
+ATTRS{idVendor}=="1e2d", ATTRS{idProduct}=="0061", ENV{.MM_USBIFNUM}=="00", SUBSYSTEM=="tty", ENV{ID_MM_PORT_TYPE_AT_PRIMARY}="1"
+ATTRS{idVendor}=="1e2d", ATTRS{idProduct}=="0061", ENV{.MM_USBIFNUM}=="02", SUBSYSTEM=="tty", ENV{ID_MM_PORT_TYPE_AT_SECONDARY}="1"
+ATTRS{idVendor}=="1e2d", ATTRS{idProduct}=="0061", ENV{.MM_USBIFNUM}=="04", SUBSYSTEM=="tty", ENV{ID_MM_PORT_TYPE_GPS}="1"
+ATTRS{idVendor}=="1e2d", ATTRS{idProduct}=="0061", ENV{.MM_USBIFNUM}=="06", ENV{ID_MM_PORT_IGNORE}="1"
+ATTRS{idVendor}=="1e2d", ATTRS{idProduct}=="0061", ENV{.MM_USBIFNUM}=="08", ENV{ID_MM_PORT_IGNORE}="1"
+
+# PLS62 family non-mbim enumeration uses alternate settings for 2G band management
+ATTRS{idVendor}=="1e2d", ATTRS{idProduct}=="005b", ENV{ID_MM_CINTERION_MODEM_FAMILY}="imt"
+# PLS62 family non-mbim enumeration
+#  ttyACM0 (if #0): AT port
+#  ttyACM1 (if #2): AT port
+#  ttyACM2 (if #4): can be AT or GNSS in some models
+#  ttyACM3 (if #6): AT port (but just ignore)
+#  ttyACM4 (if #8): DIAG/QCDM
+ATTRS{idVendor}=="1e2d", ATTRS{idProduct}=="005b", ENV{.MM_USBIFNUM}=="00", SUBSYSTEM=="tty", ENV{ID_MM_PORT_TYPE_AT_PRIMARY}="1"
+ATTRS{idVendor}=="1e2d", ATTRS{idProduct}=="005b", ENV{.MM_USBIFNUM}=="02", SUBSYSTEM=="tty", ENV{ID_MM_PORT_TYPE_AT_SECONDARY}="1"
+ATTRS{idVendor}=="1e2d", ATTRS{idProduct}=="005b", ENV{.MM_USBIFNUM}=="04", SUBSYSTEM=="tty", ENV{ID_MM_PORT_TYPE_GPS}="1"
+ATTRS{idVendor}=="1e2d", ATTRS{idProduct}=="005b", ENV{.MM_USBIFNUM}=="06", ENV{ID_MM_PORT_IGNORE}="1"
+ATTRS{idVendor}=="1e2d", ATTRS{idProduct}=="005b", ENV{.MM_USBIFNUM}=="08", SUBSYSTEM=="tty", ENV{ID_MM_PORT_TYPE_QCDM}="1"
+
+# PLS62 family mbim enumeration
+#  ttyACM0 (if #0): AT port
+#  ttyACM1 (if #2): AT port
+#  ttyACM2 (if #4): can be AT or GNSS in some models
+#  ttyACM3 (if #6): AT port (but just ignore)
+#  ttyACM4 (if #8): DIAG/QCDM
+ATTRS{idVendor}=="1e2d", ATTRS{idProduct}=="005d", ENV{.MM_USBIFNUM}=="00", SUBSYSTEM=="tty", ENV{ID_MM_PORT_TYPE_AT_PRIMARY}="1"
+ATTRS{idVendor}=="1e2d", ATTRS{idProduct}=="005d", ENV{.MM_USBIFNUM}=="02", SUBSYSTEM=="tty", ENV{ID_MM_PORT_TYPE_AT_SECONDARY}="1"
+ATTRS{idVendor}=="1e2d", ATTRS{idProduct}=="005d", ENV{.MM_USBIFNUM}=="04", SUBSYSTEM=="tty", ENV{ID_MM_PORT_TYPE_GPS}="1"
+ATTRS{idVendor}=="1e2d", ATTRS{idProduct}=="005d", ENV{.MM_USBIFNUM}=="06", ENV{ID_MM_PORT_IGNORE}="1"
+ATTRS{idVendor}=="1e2d", ATTRS{idProduct}=="005d", ENV{.MM_USBIFNUM}=="08", SUBSYSTEM=="tty", ENV{ID_MM_PORT_TYPE_QCDM}="1"
+
+# PLS63
+#  ttyACM0 (if #0): AT port
+#  ttyACM1 (if #2): AT port
+#  ttyACM2 (if #4): GPS data port
+#  ttyACM3 (if #6): DIAG/QCDM
+ATTRS{idVendor}=="1e2d", ATTRS{idProduct}=="0069", ENV{.MM_USBIFNUM}=="00", SUBSYSTEM=="tty", ENV{ID_MM_PORT_TYPE_AT_PRIMARY}="1"
+ATTRS{idVendor}=="1e2d", ATTRS{idProduct}=="0069", ENV{.MM_USBIFNUM}=="02", SUBSYSTEM=="tty", ENV{ID_MM_PORT_TYPE_AT_SECONDARY}="1"
+ATTRS{idVendor}=="1e2d", ATTRS{idProduct}=="0069", ENV{.MM_USBIFNUM}=="04", SUBSYSTEM=="tty", ENV{ID_MM_PORT_TYPE_GPS}="1"
+ATTRS{idVendor}=="1e2d", ATTRS{idProduct}=="0069", ENV{.MM_USBIFNUM}=="06", SUBSYSTEM=="tty", ENV{ID_MM_PORT_TYPE_QCDM}="1"
+
+# PLS83
+#  ttyACM0 (if #0): AT port
+#  ttyACM1 (if #2): AT port
+#  ttyACM2 (if #4): GPS data port
+#  ttyACM3 (if #6): DIAG/QCDM
+ATTRS{idVendor}=="1e2d", ATTRS{idProduct}=="006F", ENV{.MM_USBIFNUM}=="00", SUBSYSTEM=="tty", ENV{ID_MM_PORT_TYPE_AT_PRIMARY}="1"
+ATTRS{idVendor}=="1e2d", ATTRS{idProduct}=="006F", ENV{.MM_USBIFNUM}=="02", SUBSYSTEM=="tty", ENV{ID_MM_PORT_TYPE_AT_SECONDARY}="1"
+ATTRS{idVendor}=="1e2d", ATTRS{idProduct}=="006F", ENV{.MM_USBIFNUM}=="04", SUBSYSTEM=="tty", ENV{ID_MM_PORT_TYPE_GPS}="1"
+ATTRS{idVendor}=="1e2d", ATTRS{idProduct}=="006F", ENV{.MM_USBIFNUM}=="06", SUBSYSTEM=="tty", ENV{ID_MM_PORT_TYPE_QCDM}="1"
 
 LABEL="mm_cinterion_port_types_end"
 # do not edit this file, it will be overwritten on update

diff --git a/udev/rules.d/70-snap.drawio.rules b/udev/rules.d/70-snap.drawio.rules
index 46df1b8057688cbc5384663bf0e6c8b789fea662..fedf986a27e6fd4387a870293b42693130639e55 100644 (file)
--- a/udev/rules.d/70-snap.drawio.rules
+++ b/udev/rules.d/70-snap.drawio.rules
@@ -2,6 +2,8 @@
 # opengl
 KERNEL=="dma_buf_te", TAG+="snap_drawio_drawio"
 # opengl
+KERNEL=="galcore", TAG+="snap_drawio_drawio"
+# opengl
 KERNEL=="mali[0-9]*", TAG+="snap_drawio_drawio"
 # opengl
 KERNEL=="nvhost-*", TAG+="snap_drawio_drawio"

diff --git a/udev/rules.d/70-snap.ferdi.rules b/udev/rules.d/70-snap.ferdi.rules
index 6c9d827692e59c057e1f1908591d91fbf9eadf73..75525d16f26f8920e663ccc6fe50ca41c2cccf2f 100644 (file)
--- a/udev/rules.d/70-snap.ferdi.rules
+++ b/udev/rules.d/70-snap.ferdi.rules
@@ -2,6 +2,8 @@
 # opengl
 KERNEL=="dma_buf_te", TAG+="snap_ferdi_ferdi"
 # opengl
+KERNEL=="galcore", TAG+="snap_ferdi_ferdi"
+# opengl
 KERNEL=="mali[0-9]*", TAG+="snap_ferdi_ferdi"
 # opengl
 KERNEL=="nvhost-*", TAG+="snap_ferdi_ferdi"