/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to dracut-module/module-setup.sh

  • Committer: Teddy Hogeborn
  • Date: 2019-08-18 20:31:35 UTC
  • mfrom: (391 release)
  • mto: This revision was merged to the branch mainline in revision 392.
  • Revision ID: teddy@recompile.se-20190818203135-iyzyzin6324altio
Merge from release branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
dracut-module/module-setup.sh
72
72
        chmod u-s "${initdir}/${plugindir}/mandos-client"
73
73
        inst "${moddir}/ask-password-mandos.service" \
74
74
             "${systemdsystemunitdir}/ask-password-mandos.service"
75
 
        if [ -d /etc/systemd/system/ask-password-mandos.service.d ]; then
76
 
            inst /etc/systemd/system/ask-password-mandos.service.d
77
 
            inst_multiple -o /etc/systemd/system/ask-password-mandos.service.d/*.conf
78
 
        fi
79
75
        if [ ${mandos_user} != 65534 ]; then
80
76
            sed --in-place \
81
77
                --expression="s,^ExecStart=/lib/mandos/password-agent ,&--user=${mandos_user} ," \
213
209
                    # Use Diffie-Hellman parameters file
214
210
                    if dracut_module_included "systemd"; then
215
211
                        sed --in-place \
216
 
                            --expression='/^ExecStart/s/ \$MANDOS_CLIENT_OPTIONS/ --dh-params=\/etc\/mandos\/keys\/dhparams.pem&/' \
 
212
                            --expression='/^ExecStart/s/$/ --dh-params=\/etc\/mandos\/keys\/dhparams.pem/' \
217
213
                            "${initdir}/${systemdsystemunitdir}/ask-password-mandos.service"
218
214
                    else
219
215
                        sed --in-place \