Merge pull request #9121 from poettering/sd-event-inotify

add "sd_event_add_inotify()" and use it for making PID 1 rescheduler .timer units properly on timezone change

diff --git a/NEWS b/NEWS
index 89d611a96c9573b499eb7884d6bf67d3e68d58c5..8d5765222e50805119df6ef538fc6a7fa4832ad1 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -31,6 +31,10 @@ CHANGES WITH 239 in spe:
           documentation. With this release the code is adjusted to match the
           documentation.
 
+        * systemctl disable/unmask/preset/preset-all cannot be used with
+          --runtime. Previously this was allowed, but resulted in unintuitive
+          behaviour that wasn't useful.
+
 CHANGES WITH 238:
 
         * The MemoryAccounting= unit property now defaults to on. After

diff --git a/TODO b/TODO
index ee944505efaa37c4e50928b9c84ec9431504e5bc..533f9d87bd5c53eb214eafb98181162292a11b26 100644 (file)
--- a/TODO
+++ b/TODO
@@ -64,6 +64,12 @@ Features:
   DECIMAL_STR_WIDTH should probably add an extra "-" into account for negative
   numbers.
 
+* Check that users of inotify's IN_DELETE_SELF flag are using it properly, as
+  usually IN_ATTRIB is the right way to watch deleted files, as the former only
+  fires when a file is actually removed from disk, i.e. the link count drops to
+  zero and is not open anymore, while the latter happens when a file is
+  unlinked from any dir.
+
 * port systemctl, systemd-inhibit, busctl, … over to format-table.[ch]'s table formatters
 
 * pid1: lock image configured with RootDirectory=/RootImage= using the usual nspawn semantics while the unit is up

diff --git a/hwdb/60-sensor.hwdb b/hwdb/60-sensor.hwdb
index f7427d62e86c80b9355413e96c03422c3389c49e..e46a31d1660d96ace840092c2c861add57fb4de7 100644 (file)
--- a/hwdb/60-sensor.hwdb
+++ b/hwdb/60-sensor.hwdb
@@ -148,6 +148,10 @@ sensor:modalias:acpi:KIOX000A*:dmi:*:svnCube:pni7Stylus:*
 sensor:modalias:acpi:KIOX000A*:dmi:*:svnCube:pni16:*
  ACCEL_MOUNT_MATRIX=-1, 0, 0; 0, 1, 0; 0, 0, 1
 
+# Cube i7 Stylus I8L Model
+sensor:modalias:acpi:KIOX000A*:dmi:*:svnCube:pni8-L:*
+ ACCEL_MOUNT_MATRIX=-1, 0, 0; 0, 1, 0; 0, 0, 1
+
 #########################################
 # Cytrix (Mytrix)
 #########################################

diff --git a/src/locale/localed.c b/src/locale/localed.c
index d4835eb0a1837ea2ab0151ba3d3a888754df7c98..0b4da63cf0017115767408733fccd1f4fb8690d8 100644 (file)
--- a/src/locale/localed.c
+++ b/src/locale/localed.c
@@ -267,11 +267,10 @@ static void locale_free(char ***l) {
 static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *error) {
         Context *c = userdata;
         _cleanup_strv_free_ char **settings = NULL, **l = NULL;
-        char *new_locale[_VARIABLE_LC_MAX] = {};
-        _cleanup_(locale_free) char **dummy = new_locale;
+        char *new_locale[_VARIABLE_LC_MAX] = {}, **i;
+        _cleanup_(locale_free) _unused_ char **dummy = new_locale;
         bool modified = false;
         int interactive, p, r;
-        char **i;
 
         assert(m);
         assert(c);