Skip to contentSkip to conversation

systemctl: allow instance names starting with numbers

PATCH In review [email protected] 2 participants 2 messages Jul 6, 2023 – Jul 7, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 systemctl: allow instance names starting with numbers

From: Lincoln Ramsay <[email protected]>

Templated systemd service files can have an instance starting with a number, but the poky systemctl replacement for building a rootfs crafts a regex replacement pattern that uses \1, which is not terminated, and when combined with the instance name leads to an invalid expression.

For example, installing [email protected] will cause a call to re.sub with replacement \11a, which tries to use the 11th match, while the pattern only has 1 match.

There is a terminated alternative syntax that avoids this issue. \g<1> achieves the same result but doesn't break when the result is \g<1>1a.

---
 meta/recipes-core/systemd/systemd-systemctl/systemctl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/systemd/systemd-systemctl/systemctl +1 -1
index 514f747fe6..7fe751b397 100755
@@ -202,7 +202,7 @@ class SystemdUnit():
         try:
             for dependent in config.get('Install', prop):
                 # expand any %i to instance (ignoring escape sequence %%)
-                dependent = re.sub("([^%](%%)*)%i", "\\1{}".format(instance), dependent)
+                dependent = re.sub("([^%](%%)*)%i", "\\g<1>{}".format(instance), dependent)
                 wants = systemdir / "{}.{}".format(dependent, dirstem) / service
                 add_link(wants, target)
 
Signature · 1 line
2.25.1
#1 lore raw

meta/recipes-core/systemd/systemd-systemctl/systemctl class SystemdUnit(): · line 205

Quoted 2 lines · Lincoln via lists.openembedded.org
meta/recipes-core/systemd/systemd-systemctl/systemctl +1 -1
-                dependent = re.sub("([^%](%%)*)%i", "\\1{}".format(instance), dependent)
+                dependent = re.sub("([^%](%%)*)%i", "\\g<1>{}".format(instance), dependent)

Interestingly, Yuta submitted the identical patch last week (queued for master).

Ross