diff options
| author | Niels Thykier <niels@thykier.net> | 2017-10-08 14:46:13 +0000 |
|---|---|---|
| committer | Niels Thykier <niels@thykier.net> | 2017-10-13 18:08:29 +0000 |
| commit | a6746c107822c3c0f6d5d5fe8ee1c98a445062ae (patch) | |
| tree | 5c238e6f7646c20983620bb2cd02bd33fb1bae97 /dh_installsystemd | |
| parent | ddcd9d20b3c321a95f9e3e2f0e1978468717d773 (diff) | |
dh_installsystemd: Fix bug in handling of template units (see aaf90aff)
Signed-off-by: Niels Thykier <niels@thykier.net>
Diffstat (limited to 'dh_installsystemd')
| -rwxr-xr-x | dh_installsystemd | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/dh_installsystemd b/dh_installsystemd index ccb55a51..da54689b 100755 --- a/dh_installsystemd +++ b/dh_installsystemd @@ -230,16 +230,14 @@ foreach my $package (@{$dh{DOPACKAGES}}) { $script=$package; } - foreach my $suffix ('', '@') { - install_unit("$package$suffix", $script, 'service', "$tmpdir/lib/systemd/system"); - install_unit("$package$suffix", $script, 'target', "$tmpdir/lib/systemd/system"); - install_unit("$package$suffix", $script, 'socket', "$tmpdir/lib/systemd/system"); - install_unit("$package$suffix", $script, 'mount', "$tmpdir/lib/systemd/system") if $suffix eq ''; - install_unit("$package$suffix", $script, 'path', "$tmpdir/lib/systemd/system"); - install_unit("$package$suffix", $script, 'tmpfile', "$tmpdir/usr/lib/tmpfiles.d", 'conf') if $suffix eq ''; - install_unit("$package$suffix", $script, 'timer', "$tmpdir/lib/systemd/system"); + for my $service_type (qw(service target socket path timer)) { + install_unit($package, $script, $service_type, "$tmpdir/lib/systemd/system"); + install_unit("${package}@", "${script}@", $service_type, "$tmpdir/lib/systemd/system"); } + install_unit($package, $script, 'mount', "$tmpdir/lib/systemd/system"); + install_unit($package, $script, 'tmpfile', "$tmpdir/usr/lib/tmpfiles.d", 'conf'); + my $oldcwd = getcwd(); find({ wanted => sub { |