SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

units: Use ImportCredential= where applicable

Browse Source
This commit is contained in:
Daan De Meyer
2023-06-08 14:09:36 +02:00
parent bbfb25f4b9
commit 1ab6ae1957
8 changed files with 19 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
units/systemd-firstboot.service
+4 -7
View File
@@ -32,10 +32,7 @@ StandardError=tty
# Optionally, pick up basic fields from credentials passed to the service # Optionally, pick up basic fields from credentials passed to the service
# manager. This is useful for importing this data from nspawn's # manager. This is useful for importing this data from nspawn's
# --set-credential= switch. # --set-credential= switch.
LoadCredential=passwd.hashed-password.root ImportCredential=passwd.hashed-password.root
LoadCredential=passwd.plaintext-password.root ImportCredential=passwd.plaintext-password.root
LoadCredential=passwd.shell.root ImportCredential=passwd.shell.root
LoadCredential=firstboot.locale ImportCredential=firstboot.*
LoadCredential=firstboot.locale-messages
LoadCredential=firstboot.keymap
LoadCredential=firstboot.timezone
units/systemd-resolved.service.in
+2 -2
View File
@@ -50,8 +50,8 @@ SystemCallErrorNumber=EPERM
SystemCallFilter=@system-service SystemCallFilter=@system-service
Type=notify Type=notify
User=systemd-resolve User=systemd-resolve
LoadCredential=network.dns ImportCredential=network.dns
LoadCredential=network.search_domains ImportCredential=network.search_domains
{{SERVICE_WATCHDOG}} {{SERVICE_WATCHDOG}}
[Install] [Install]
units/systemd-sysctl.service.in
+1 -1
View File
@@ -21,4 +21,4 @@ Type=oneshot
RemainAfterExit=yes RemainAfterExit=yes
ExecStart={{ROOTLIBEXECDIR}}/systemd-sysctl ExecStart={{ROOTLIBEXECDIR}}/systemd-sysctl
TimeoutSec=90s TimeoutSec=90s
LoadCredential=sysctl.extra ImportCredential=sysctl.*
units/systemd-sysusers.service
+4 -4
View File
@@ -29,9 +29,9 @@ TimeoutSec=90s
# Optionally, pick up a root password and shell for the root user from a # 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 # credential passed to the service manager. This is useful for importing this
# data from nspawn's --set-credential= switch. # data from nspawn's --set-credential= switch.
LoadCredential=passwd.hashed-password.root ImportCredential=passwd.hashed-password.root
LoadCredential=passwd.plaintext-password.root ImportCredential=passwd.plaintext-password.root
LoadCredential=passwd.shell.root ImportCredential=passwd.shell.root
# Also, allow configuring extra sysusers lines via a credential # Also, allow configuring extra sysusers lines via a credential
LoadCredential=sysusers.extra ImportCredential=sysusers.*
units/systemd-tmpfiles-clean.service
+1 -1
View File
@@ -21,4 +21,4 @@ Type=oneshot
ExecStart=systemd-tmpfiles --clean ExecStart=systemd-tmpfiles --clean
SuccessExitStatus=DATAERR SuccessExitStatus=DATAERR
IOSchedulingClass=idle IOSchedulingClass=idle
LoadCredential=tmpfiles.extra ImportCredential=tmpfiles.*
units/systemd-tmpfiles-setup-dev.service
+1 -1
View File
@@ -22,4 +22,4 @@ Type=oneshot
RemainAfterExit=yes RemainAfterExit=yes
ExecStart=systemd-tmpfiles --prefix=/dev --create --boot --graceful ExecStart=systemd-tmpfiles --prefix=/dev --create --boot --graceful
SuccessExitStatus=DATAERR CANTCREAT SuccessExitStatus=DATAERR CANTCREAT
LoadCredential=tmpfiles.extra ImportCredential=tmpfiles.*
units/systemd-tmpfiles-setup.service
+5 -5
View File
@@ -23,8 +23,8 @@ Type=oneshot
RemainAfterExit=yes RemainAfterExit=yes
ExecStart=systemd-tmpfiles --create --remove --boot ExecStart=systemd-tmpfiles --create --remove --boot
SuccessExitStatus=DATAERR CANTCREAT SuccessExitStatus=DATAERR CANTCREAT
LoadCredential=tmpfiles.extra ImportCredential=tmpfiles.*
LoadCredential=login.motd ImportCredential=login.motd
LoadCredential=login.issue ImportCredential=login.issue
LoadCredential=network.hosts ImportCredential=network.hosts
LoadCredential=ssh.authorized_keys.root ImportCredential=ssh.authorized_keys.root
units/systemd-vconsole-setup.service.in
+1 -5
View File
@@ -21,8 +21,4 @@ Before=initrd-switch-root.target shutdown.target
Type=oneshot Type=oneshot
RemainAfterExit=yes RemainAfterExit=yes
ExecStart={{ROOTLIBEXECDIR}}/systemd-vconsole-setup ExecStart={{ROOTLIBEXECDIR}}/systemd-vconsole-setup
LoadCredential=vconsole.keymap ImportCredential=vconsole.*
LoadCredential=vconsole.keymap_toggle
LoadCredential=vconsole.font
LoadCredential=vconsole.font_map
LoadCredential=vconsole.font_unimap