units: Use ImportCredential= where applicable

diff --git a/units/systemd-firstboot.service b/units/systemd-firstboot.service
index 984ebf282ad98f28d1a79b1f238976cf4ae0c118..0c8d574ef8b27cffdaa933b21ccffc916a85ef84 100644 (file)
--- a/units/systemd-firstboot.service
+++ b/units/systemd-firstboot.service
@@ -32,10 +32,7 @@ StandardError=tty
 # Optionally, pick up basic fields from credentials passed to the service
 # manager. This is useful for importing this data from nspawn's
 # --set-credential= switch.
-LoadCredential=passwd.hashed-password.root
-LoadCredential=passwd.plaintext-password.root
-LoadCredential=passwd.shell.root
-LoadCredential=firstboot.locale
-LoadCredential=firstboot.locale-messages
-LoadCredential=firstboot.keymap
-LoadCredential=firstboot.timezone
+ImportCredential=passwd.hashed-password.root
+ImportCredential=passwd.plaintext-password.root
+ImportCredential=passwd.shell.root
+ImportCredential=firstboot.*

diff --git a/units/systemd-resolved.service.in b/units/systemd-resolved.service.in
index 10ce49345e506b70f95c35544f59aa64cbb6d2fe..a078a9dd684bf08da87c89c068365f054a67c670 100644 (file)
--- a/units/systemd-resolved.service.in
+++ b/units/systemd-resolved.service.in
@@ -50,8 +50,8 @@ SystemCallErrorNumber=EPERM
 SystemCallFilter=@system-service
 Type=notify
 User=systemd-resolve
-LoadCredential=network.dns
-LoadCredential=network.search_domains
+ImportCredential=network.dns
+ImportCredential=network.search_domains
 {{SERVICE_WATCHDOG}}
 
 [Install]

diff --git a/units/systemd-sysctl.service.in b/units/systemd-sysctl.service.in
index 77793f38948fdfe015da08a73b7eb70227ec82c3..7307601a7dfb077d67438ebfb6b982146a47edb1 100644 (file)
--- a/units/systemd-sysctl.service.in
+++ b/units/systemd-sysctl.service.in
@@ -21,4 +21,4 @@ Type=oneshot
 RemainAfterExit=yes
 ExecStart={{ROOTLIBEXECDIR}}/systemd-sysctl
 TimeoutSec=90s
-LoadCredential=sysctl.extra
+ImportCredential=sysctl.*

diff --git a/units/systemd-sysusers.service b/units/systemd-sysusers.service
index 2ec276684164cf8184d211448acb4a2ec43c8ab3..84fd66de37aac0a9ebd6ed5916db3febe1e37a34 100644 (file)
--- a/units/systemd-sysusers.service
+++ b/units/systemd-sysusers.service
@@ -29,9 +29,9 @@ TimeoutSec=90s
 # Optionally, pick up a root password and shell for the root user from a
 # credential passed to the service manager. This is useful for importing this
 # data from nspawn's --set-credential= switch.
-LoadCredential=passwd.hashed-password.root
-LoadCredential=passwd.plaintext-password.root
-LoadCredential=passwd.shell.root
+ImportCredential=passwd.hashed-password.root
+ImportCredential=passwd.plaintext-password.root
+ImportCredential=passwd.shell.root
 
 # Also, allow configuring extra sysusers lines via a credential
-LoadCredential=sysusers.extra
+ImportCredential=sysusers.*

diff --git a/units/systemd-tmpfiles-clean.service b/units/systemd-tmpfiles-clean.service
index 4163aef729b75a12633f70cc10246b2609877cb0..7b0edba412ba405d8020fb3d400d9ec832bee0cc 100644 (file)
--- a/units/systemd-tmpfiles-clean.service
+++ b/units/systemd-tmpfiles-clean.service
@@ -21,4 +21,4 @@ Type=oneshot
 ExecStart=systemd-tmpfiles --clean
 SuccessExitStatus=DATAERR
 IOSchedulingClass=idle
-LoadCredential=tmpfiles.extra
+ImportCredential=tmpfiles.*

diff --git a/units/systemd-tmpfiles-setup-dev.service b/units/systemd-tmpfiles-setup-dev.service
index 635e840a488f399210f644f2a6b6eeb56e737c37..acaa9510aa60bbd8cc8ed61d524c8a1a7af42925 100644 (file)
--- a/units/systemd-tmpfiles-setup-dev.service
+++ b/units/systemd-tmpfiles-setup-dev.service
@@ -22,4 +22,4 @@ Type=oneshot
 RemainAfterExit=yes
 ExecStart=systemd-tmpfiles --prefix=/dev --create --boot --graceful
 SuccessExitStatus=DATAERR CANTCREAT
-LoadCredential=tmpfiles.extra
+ImportCredential=tmpfiles.*

diff --git a/units/systemd-tmpfiles-setup.service b/units/systemd-tmpfiles-setup.service
index 506f53eaa2f29cf465e51bda644e34c0a9ff3065..6c5e3de8fd96248ea0c8c3594e826f914d1c6054 100644 (file)
--- a/units/systemd-tmpfiles-setup.service
+++ b/units/systemd-tmpfiles-setup.service
@@ -23,8 +23,8 @@ Type=oneshot
 RemainAfterExit=yes
 ExecStart=systemd-tmpfiles --create --remove --boot
 SuccessExitStatus=DATAERR CANTCREAT
-LoadCredential=tmpfiles.extra
-LoadCredential=login.motd
-LoadCredential=login.issue
-LoadCredential=network.hosts
-LoadCredential=ssh.authorized_keys.root
+ImportCredential=tmpfiles.*
+ImportCredential=login.motd
+ImportCredential=login.issue
+ImportCredential=network.hosts
+ImportCredential=ssh.authorized_keys.root

diff --git a/units/systemd-vconsole-setup.service.in b/units/systemd-vconsole-setup.service.in
index 41d738a63d47294cfaeb9507bd5cc310980550c1..0604ed0173c5711461b7f6d5391d4feaae6d1532 100644 (file)
--- a/units/systemd-vconsole-setup.service.in
+++ b/units/systemd-vconsole-setup.service.in
@@ -21,8 +21,4 @@ Before=initrd-switch-root.target shutdown.target
 Type=oneshot
 RemainAfterExit=yes
 ExecStart={{ROOTLIBEXECDIR}}/systemd-vconsole-setup
-LoadCredential=vconsole.keymap
-LoadCredential=vconsole.keymap_toggle
-LoadCredential=vconsole.font
-LoadCredential=vconsole.font_map
-LoadCredential=vconsole.font_unimap
+ImportCredential=vconsole.*