=== modified file 'dracut-module/ask-password-mandos.service'
--- dracut-module/ask-password-mandos.service	2019-07-27 10:11:45 +0000
+++ dracut-module/ask-password-mandos.service	2020-02-05 21:39:28 +0000
@@ -48,4 +48,4 @@
 ConditionPathIsMountPoint=!/sysroot
 
 [Service]
-ExecStart=/lib/mandos/password-agent -- /lib/mandos/mandos-client --pubkey=/etc/mandos/keys/pubkey.txt --seckey=/etc/mandos/keys/seckey.txt --tls-pubkey=/etc/mandos/keys/tls-pubkey.pem --tls-privkey=/etc/mandos/keys/tls-privkey.pem
+ExecStart=/lib/mandos/password-agent $PASSWORD_AGENT_OPTIONS -- /lib/mandos/mandos-client --pubkey=/etc/mandos/keys/pubkey.txt --seckey=/etc/mandos/keys/seckey.txt --tls-pubkey=/etc/mandos/keys/tls-pubkey.pem --tls-privkey=/etc/mandos/keys/tls-privkey.pem $MANDOS_CLIENT_OPTIONS

=== modified file 'dracut-module/module-setup.sh'
--- dracut-module/module-setup.sh	2019-07-27 10:11:45 +0000
+++ dracut-module/module-setup.sh	2020-02-05 21:39:28 +0000
@@ -72,6 +72,10 @@
 	chmod u-s "${initdir}/${plugindir}/mandos-client"
 	inst "${moddir}/ask-password-mandos.service" \
 	     "${systemdsystemunitdir}/ask-password-mandos.service"
+	if [ -d /etc/systemd/system/ask-password-mandos.service.d ]; then
+	    inst /etc/systemd/system/ask-password-mandos.service.d
+	    inst_multiple -o /etc/systemd/system/ask-password-mandos.service.d/*.conf
+	fi
 	if [ ${mandos_user} != 65534 ]; then
 	    sed --in-place \
 		--expression="s,^ExecStart=/lib/mandos/password-agent ,&--user=${mandos_user} ," \
@@ -209,7 +213,7 @@
 		    # Use Diffie-Hellman parameters file
 		    if dracut_module_included "systemd"; then
 			sed --in-place \
-			    --expression='/^ExecStart/s/$/ --dh-params=\/etc\/mandos\/keys\/dhparams.pem/' \
+			    --expression='/^ExecStart/s/ \$MANDOS_CLIENT_OPTIONS/ --dh-params=\/etc\/mandos\/keys\/dhparams.pem&/' \
 			    "${initdir}/${systemdsystemunitdir}/ask-password-mandos.service"
 		    else
 			sed --in-place \