From: Martin Wilck <mwilck@suse.com>
Date: Fri, 20 Oct 2023 14:25:15 +0000 (+0200)
Subject: units: modprobe@.service: don't unescape instance name
X-Git-Tag: v255-rc1~171
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bf25cf6c49253e922524dfa0e7960f554838f18b;p=thirdparty%2Fsystemd.git

units: modprobe@.service: don't unescape instance name

modprobe treats "-" and "_" interchangeably, thereby avoiding frequent
errors because some module names contain dashes and others underscores.

Because modprobe@.service unescapes the instance name, an attempt to
start "modprobe@dm-crypt.service" will run "modprobe -abq dm/crypt",
which is doomed to fail. "modprobe@dm_crypt.service" will work as
expected. Thus unescaping the instance name has surprising side effects.
Use "%i" instead.
---

diff --git a/units/modprobe@.service b/units/modprobe@.service
index 85a2c08dee6..fe631fffeb8 100644
--- a/units/modprobe@.service
+++ b/units/modprobe@.service
@@ -17,4 +17,4 @@ StartLimitIntervalSec=0
 
 [Service]
 Type=oneshot
-ExecStart=-/sbin/modprobe -abq %I
+ExecStart=-/sbin/modprobe -abq %i