From: janana <40876700+jiayi0118@users.noreply.github.com>
Date: Wed, 29 Nov 2023 03:36:52 +0000 (+0800)
Subject: rules: go to the end of rules indeed when dm is suspended
X-Git-Tag: v255-rc4~29
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c1a2ada89708d6aeeada496712cb24a4a58e75cc;p=thirdparty%2Fsystemd.git

rules: go to the end of rules indeed when dm is suspended

The previous patch 466266c does not make sense indeed, that is to say, if the SYSTEMD_READY is not recorded in the database, the GOTO="systemd_end" will not be applied.

The IMPORT{db} is actually a matching token, it returns false when there is no SYSTEMD_READY recorded in the database.

The previous patch 466266c tended to inherit the state of SYSTEMD_READY from the database and skip to the end of current rule file. But when the database does not contain SYSTEMD_READY, e.g., the dm-* is not set db_persistent during initrd and the database will be cleared after switching root, the following rules will still be applied not as expected.
---

diff --git a/rules.d/99-systemd.rules.in b/rules.d/99-systemd.rules.in
index 9bf02a705fe..455a2368eb7 100644
--- a/rules.d/99-systemd.rules.in
+++ b/rules.d/99-systemd.rules.in
@@ -19,7 +19,9 @@ SUBSYSTEM=="ubi", TAG+="systemd"
 SUBSYSTEM=="block", TAG+="systemd"
 
 # We can't make any conclusions about suspended DM devices so let's just import previous SYSTEMD_READY state and skip other rules
-SUBSYSTEM=="block", ENV{DM_SUSPENDED}=="1", IMPORT{db}="SYSTEMD_READY", GOTO="systemd_end"
+SUBSYSTEM=="block", ENV{DM_SUSPENDED}=="1", IMPORT{db}="SYSTEMD_READY"
+SUBSYSTEM=="block", ENV{DM_SUSPENDED}=="1", GOTO="systemd_end"
+
 SUBSYSTEM=="block", ACTION=="add", ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", ENV{SYSTEMD_READY}="0"
 
 # Ignore encrypted devices with no identified superblock on it, since
diff --git a/test/fuzz/fuzz-udev-rules/systemd.rules b/test/fuzz/fuzz-udev-rules/systemd.rules
index 278383b02cc..5f29d709ae5 100644
--- a/test/fuzz/fuzz-udev-rules/systemd.rules
+++ b/test/fuzz/fuzz-udev-rules/systemd.rules
@@ -17,7 +17,9 @@ SUBSYSTEM=="ubi", TAG+="systemd"
 SUBSYSTEM=="block", TAG+="systemd"
 
 # We can't make any conclusions about suspended DM devices so let's just import previous SYSTEMD_READY state and skip other rules
-SUBSYSTEM=="block", ENV{DM_SUSPENDED}=="1", IMPORT{db}="SYSTEMD_READY", GOTO="systemd_end"
+SUBSYSTEM=="block", ENV{DM_SUSPENDED}=="1", IMPORT{db}="SYSTEMD_READY"
+SUBSYSTEM=="block", ENV{DM_SUSPENDED}=="1", GOTO="systemd_end"
+
 SUBSYSTEM=="block", ACTION=="add", ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", ENV{SYSTEMD_READY}="0"
 
 # Ignore encrypted devices with no identified superblock on it, since