resolved: onlyif snippet requires shell support

simondeziel · simondeziel · commit 0f2f4633a6df · 2022-08-15T09:26:32.000-04:00
Fixes a problem (I) introduced in #276. Signed-off-by: Simon Deziel <simon@sdeziel.info>
diff --git a/manifests/resolved.pp b/manifests/resolved.pp
@@ -87,9 +87,10 @@
       # /etc/resolv.conf to something that might actually work on
       # reboot.
       exec { 'restore_resolv.conf_if_possible':
-        command => 'cp --remove-destination -f /run/systemd/resolve/resolv.conf /etc/resolv.conf',
-        onlyif  => 'l="$(readlink /etc/resolv.conf)"; test "$l" = "/run/systemd/resolve/resolv.conf" || test "$l" = "/run/systemd/resolve/stub-resolv.conf',
-        path    => $facts['path'],
+        command  => 'cp --remove-destination -f /run/systemd/resolve/resolv.conf /etc/resolv.conf',
+        onlyif   => 'l="$(readlink /etc/resolv.conf)"; test "$l" = "/run/systemd/resolve/resolv.conf" || test "$l" = "/run/systemd/resolve/stub-resolv.conf',
+        path     => $facts['path'],
+        provider => 'shell',
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -87,9 +87,10 @@`
`87`	`87`	`# /etc/resolv.conf to something that might actually work on`
`88`	`88`	`# reboot.`
`89`	`89`	`exec { 'restore_resolv.conf_if_possible':`
`90`		`- command => 'cp --remove-destination -f /run/systemd/resolve/resolv.conf /etc/resolv.conf',`
`91`		`- onlyif => 'l="$(readlink /etc/resolv.conf)"; test "$l" = "/run/systemd/resolve/resolv.conf" \|\| test "$l" = "/run/systemd/resolve/stub-resolv.conf',`
`92`		`- path => $facts['path'],`
	`90`	`+ command => 'cp --remove-destination -f /run/systemd/resolve/resolv.conf /etc/resolv.conf',`
	`91`	`+ onlyif => 'l="$(readlink /etc/resolv.conf)"; test "$l" = "/run/systemd/resolve/resolv.conf" \|\| test "$l" = "/run/systemd/resolve/stub-resolv.conf',`
	`92`	`+ path => $facts['path'],`
	`93`	`+ provider => 'shell',`
`93`	`94`	`}`
`94`	`95`	`}`
`95`	`96`	`}`