Merge pull request #30055 from YHNdnzj/logind-handle-action

logind-action: several cleanups

diff --git a/TODO b/TODO
index 6882a1b221580fc632f76816a57c08d3fcf52dea..29d36316264cd00126d6d75c839ed69fa17ed9bc 100644 (file)
--- a/TODO
+++ b/TODO
@@ -133,6 +133,18 @@ Deprecations and removals:
 
 Features:
 
+* cryptsetup: new crypttab option to auto-grow a luks device to its backing
+  partition size. new crypttab option to reencrypt a luks device with a new
+  volume key.
+
+* we probably should have some infrastructure to acquire sysexts with
+  drivers/firmware for local hardware automatically. Idea: reuse the modalias
+  logic of the kernel for this: make the main OS image install a hwdb file
+  that matches against local modalias strings, and adds properties to relevant
+  devices listing names of sysexts needed to support the hw. Then provide some
+  tool that goes through all devices and tries to acquire/download the
+  specified images.
+
 * repart + cryptsetup: support file systems that are encrypted and use verity
   on top. Usecase: confexts that shall be signed by the admin but also be
   confidential. Then, add a new --make-ddi=confext-encrypted for this.

diff --git a/man/org.freedesktop.login1.xml b/man/org.freedesktop.login1.xml
index ba1614be4e5011f16f65f147762868c83b225d8d..877bf463a07fd5e599f79393aa5f47f8d53d2714 100644 (file)
--- a/man/org.freedesktop.login1.xml
+++ b/man/org.freedesktop.login1.xml
@@ -1159,7 +1159,6 @@ node /org/freedesktop/login1/session/1 {
       readonly u VTNr = ...;
       @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
       readonly (so) Seat = ...;
-      @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
       readonly s TTY = '...';
       readonly s Display = '...';
       @org.freedesktop.DBus.Property.EmitsChangedSignal("const")

diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c
index ad4e5c5f6db32a816152d01b2650b3154b744440..a136ae418cee126d453a84f0f11897a87720b631 100644 (file)
--- a/src/login/logind-session-dbus.c
+++ b/src/login/logind-session-dbus.c
@@ -874,7 +874,7 @@ static const sd_bus_vtable session_vtable[] = {
         BUS_PROPERTY_DUAL_TIMESTAMP("Timestamp", offsetof(Session, timestamp), SD_BUS_VTABLE_PROPERTY_CONST),
         SD_BUS_PROPERTY("VTNr", "u", NULL, offsetof(Session, vtnr), SD_BUS_VTABLE_PROPERTY_CONST),
         SD_BUS_PROPERTY("Seat", "(so)", property_get_seat, 0, SD_BUS_VTABLE_PROPERTY_CONST),
-        SD_BUS_PROPERTY("TTY", "s", NULL, offsetof(Session, tty), SD_BUS_VTABLE_PROPERTY_CONST),
+        SD_BUS_PROPERTY("TTY", "s", NULL, offsetof(Session, tty), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
         SD_BUS_PROPERTY("Display", "s", NULL, offsetof(Session, display), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
         SD_BUS_PROPERTY("Remote", "b", bus_property_get_bool, offsetof(Session, remote), SD_BUS_VTABLE_PROPERTY_CONST),
         SD_BUS_PROPERTY("RemoteHost", "s", NULL, offsetof(Session, remote_host), SD_BUS_VTABLE_PROPERTY_CONST),

diff --git a/src/udev/udev-manager.c b/src/udev/udev-manager.c
index 0d90882d3185fc446e8f1713e3c0e1620e93b929..8077e51055d7221ec6f7f9f7118f4ff58b9504a7 100644 (file)
--- a/src/udev/udev-manager.c
+++ b/src/udev/udev-manager.c
@@ -1289,7 +1289,7 @@ int manager_main(Manager *manager) {
 
         r = udev_ctrl_start(manager->ctrl, on_ctrl_msg, manager);
         if (r < 0)
-                return log_error_errno(r, "Failed to start device monitor: %m");
+                return log_error_errno(r, "Failed to start udev control: %m");
 
         /* This needs to be after the inotify and uevent handling, to make sure
          * that the ping is send back after fully processing the pending uevents

diff --git a/test/units/testsuite-17.10.sh b/test/units/testsuite-17.10.sh
index f9708319b0eed2990ba7a4b4ea48fb113498c8ff..20f120a93055133503c73eb8965c8e6815dd8139 100755 (executable)
--- a/test/units/testsuite-17.10.sh
+++ b/test/units/testsuite-17.10.sh
@@ -25,7 +25,7 @@ netdev=dummy17.10
 ip link add $netdev type dummy
 
 blk="$(mktemp)"
-dd if=/dev/null of="$blk" bs=1M count=1
+dd if=/dev/zero of="$blk" bs=1M count=1
 loopdev="$(losetup --show -f "$blk")"
 
 udevadm -h