shared/install: fix handling of a linked unit file

When we have a symlink that goes outside of our search path, we should just
ignore the target file name. But we were verifying it, and rejecting in
the case where a symlink was created manually.

diff --git a/src/shared/install.c b/src/shared/install.c
index 6aacdcf967c58cdf964ac1dc6633f59da2e41a45..20707edf58b0c841092677fedc3b816a22bc98ee 100644 (file)
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -1606,7 +1606,9 @@ static int install_info_traverse(
                                 return -ELOOP;
                 }
 
-                r = install_info_follow(ctx, i, lp, flags, false);
+                r = install_info_follow(ctx, i, lp, flags,
+                                        /* If linked, don't look at the target name */
+                                        /* ignore_different_name= */ i->type == UNIT_FILE_TYPE_LINKED);
                 if (r == -EXDEV) {
                         _cleanup_free_ char *buffer = NULL;
                         const char *bn;

diff --git a/test/test-systemctl-enable.sh b/test/test-systemctl-enable.sh
index 9463433c5ba4b1af6b0ce33b0fe308dbbe80c820..45f3513de3ac42c1fe61c9b72c0152065c88b2f6 100644 (file)
--- a/test/test-systemctl-enable.sh
+++ b/test/test-systemctl-enable.sh
@@ -216,12 +216,16 @@ cat >"$root/link3.suffix" <<EOF
 WantedBy=services.target
 EOF
 
+# We wouldn't create such a link ourselves, but it should accept it when present.
 ln -s "/link3.suffix" "$root/etc/systemd/system/link3.service"
 
-# SYSTEMD_LOG_LEVEL=debug SYSTEMD_LOG_LOCATION=1 "$systemctl" --root="$root" enable 'link3.service'
-# islink "$root/etc/systemd/system/link3.service" "/link3.suffix"
-# islink "$root/etc/systemd/system/services.target.wants/link3.service" "../link3.service"
-# unit_file_load_or_readlink() needs to be fixed to not follow links
+SYSTEMD_LOG_LEVEL=debug SYSTEMD_LOG_LOCATION=1 "$systemctl" --root="$root" enable 'link3.service'
+islink "$root/etc/systemd/system/link3.service" "/link3.suffix"
+islink "$root/etc/systemd/system/services.target.wants/link3.service" "../link3.service"
+
+SYSTEMD_LOG_LEVEL=debug SYSTEMD_LOG_LOCATION=1 "$systemctl" --root="$root" disable 'link3.service'
+test ! -h "$root/etc/systemd/system/link3.service"
+test ! -h "$root/etc/systemd/system/services.target.wants/link3.service"
 
 : -------enable on masked-------------------------------------
 ln -s "/dev/null" "$root/etc/systemd/system/masked.service"