Skip to contentSkip to conversation

e2scrub: fix systemd escaping again

PATCH Applied Darrick J. Wong 2 participants 2 messages Nov 6, 2018 – Nov 16, 2018

lore
Share & tools
lore

Darrick J. Wong

author
#0 lore raw

PATCH 1/1 e2scrub: fix systemd escaping again

From: Darrick J. Wong <[email protected]>

Apparently newer versions of systemd than the one on this author's laptop <cough> now complain about lack of (path) escaping in unit instance variable contents:

 # e2scrub_all
 Scrubbing /home...
 Invalid unit name "e2scrub@/home" was escaped as "e2scrub@-home"
 (maybe you should use systemd-escape?)
 Starting Online ext4 Metadata Check for /home...

So change the escape_path_for_systemd function to escape paths unconditionally to make the warning go away.

Signed-off-by Darrick J. Wong <[email protected]>
---
 scrub/e2scrub_all.in |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
scrub/e2scrub_all.in +7 -2
index 9581dc2c4..23d122d25 100644
@@ -101,13 +101,18 @@ ls_scrub_targets() {
 # systemd doesn't know to do path escaping on the instance variable we pass
 # to the e2scrub service, which breaks things if there is a dash in the path
 # name.  Therefore, do the path escaping ourselves if needed.
+#
+# systemd path escaping also drops the initial slash so we add that back in so
+# that log messages from the service units preserve the full path and users can
+# look up log messages using full paths.  However, for "/" the escaping rules
+# do /not/ drop the initial slash, so we have to special-case that here.
 escape_path_for_systemd() {
 	local path="$1"
 
-	if echo "${path}" | grep -q -- "-"; then
+	if [ "${path}" != "/" ]; then
 		echo "-$(systemd-escape --path "${path}")"
 	else
-		echo "${path}"
+		echo "-"
 	fi
 }
Applied
#1 lore raw
Quoted 12 lines · Darrick J. Wong

From: Darrick J. Wong <[email protected]>

Apparently newer versions of systemd than the one on this author's laptop <cough> now complain about lack of (path) escaping in unit instance variable contents:

 # e2scrub_all
 Scrubbing /home...
 Invalid unit name "e2scrub@/home" was escaped as "e2scrub@-home"
 (maybe you should use systemd-escape?)
 Starting Online ext4 Metadata Check for /home...
Quoted 4 lines

So change the escape_path_for_systemd function to escape paths unconditionally to make the warning go away.

Signed-off-by Darrick J. Wong <[email protected]>

Thanks, applied.

- Ted