/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 Makefile

  • Committer: Teddy Hogeborn
  • Date: 2019-08-18 00:23:21 UTC
  • mto: This revision was merged to the branch mainline in revision 390.
  • Revision ID: teddy@recompile.se-20190818002321-qvjsogu0rhoyuwyc
Use the systemd sysusers.d mechanism, if present

* Makefile (SYSUSERS): New.
  (install-server): Also install sysusers.d file, if $(SYSUSERS)
                    exists.
* debian/mandos.dirs (usr/lib/sysusers.d): New.
* sysusers.d-mandos.conf: New.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
10
10
        -Wmissing-format-attribute -Wnormalized=nfc -Wpacked \
11
11
        -Wredundant-decls -Wnested-externs -Winline -Wvla \
12
12
        -Wvolatile-register-var -Woverlength-strings
13
 
#DEBUG:=-ggdb3 -fsanitize=address 
14
 
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
15
 
# and <https://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
16
 
FORTIFY:=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
 
13
 
 
14
#DEBUG:=-ggdb3 -fsanitize=address $(SANITIZE)
 
15
## Check which sanitizing options can be used
 
16
#SANITIZE:=$(foreach option,$(ALL_SANITIZE_OPTIONS),$(shell \
 
17
#       echo 'int main(){}' | $(CC) --language=c $(option) \
 
18
#       /dev/stdin -o /dev/null >/dev/null 2>&1 && echo $(option)))
17
19
# <https://developerblog.redhat.com/2014/10/16/gcc-undefined-behavior-sanitizer-ubsan/>
18
20
ALL_SANITIZE_OPTIONS:=-fsanitize=leak -fsanitize=undefined \
19
21
        -fsanitize=shift -fsanitize=integer-divide-by-zero \
23
25
        -fsanitize=object-size -fsanitize=float-divide-by-zero \
24
26
        -fsanitize=float-cast-overflow -fsanitize=nonnull-attribute \
25
27
        -fsanitize=returns-nonnull-attribute -fsanitize=bool \
26
 
        -fsanitize=enum
27
 
# Check which sanitizing options can be used
28
 
SANITIZE:=$(foreach option,$(ALL_SANITIZE_OPTIONS),$(shell \
29
 
        echo 'int main(){}' | $(CC) --language=c $(option) /dev/stdin \
30
 
        -o /dev/null >/dev/null 2>&1 && echo $(option)))
 
28
        -fsanitize=enum -fsanitize-address-use-after-scope
 
29
 
 
30
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
 
31
# and <https://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
 
32
FORTIFY:=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
31
33
LINK_FORTIFY_LD:=-z relro -z now
32
34
LINK_FORTIFY:=
33
35
 
39
41
#COVERAGE=--coverage
40
42
OPTIMIZE:=-Os -fno-strict-aliasing
41
43
LANGUAGE:=-std=gnu11
 
44
FEATURES:=-D_FILE_OFFSET_BITS=64
42
45
htmldir:=man
43
 
version:=1.7.19
 
46
version:=1.8.7
44
47
SED:=sed
45
 
 
46
 
USER:=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
47
 
GROUP:=$(firstword $(subst :, ,$(shell getent group _mandos || getent group nogroup || echo 65534)))
 
48
PKG_CONFIG?=pkg-config
 
49
 
 
50
USER:=$(firstword $(subst :, ,$(shell getent passwd _mandos \
 
51
        || getent passwd nobody || echo 65534)))
 
52
GROUP:=$(firstword $(subst :, ,$(shell getent group _mandos \
 
53
        || getent group nogroup || echo 65534)))
 
54
 
 
55
LINUXVERSION:=$(shell uname --kernel-release)
48
56
 
49
57
## Use these settings for a traditional /usr/local install
50
58
# PREFIX:=$(DESTDIR)/usr/local
52
60
# KEYDIR:=$(DESTDIR)/etc/mandos/keys
53
61
# MANDIR:=$(PREFIX)/man
54
62
# INITRAMFSTOOLS:=$(DESTDIR)/etc/initramfs-tools
 
63
# DRACUTMODULE:=$(DESTDIR)/usr/lib/dracut/modules.d/90mandos
55
64
# STATEDIR:=$(DESTDIR)/var/lib/mandos
56
65
# LIBDIR:=$(PREFIX)/lib
57
66
##
62
71
KEYDIR:=$(DESTDIR)/etc/keys/mandos
63
72
MANDIR:=$(PREFIX)/share/man
64
73
INITRAMFSTOOLS:=$(DESTDIR)/usr/share/initramfs-tools
 
74
DRACUTMODULE:=$(DESTDIR)/usr/lib/dracut/modules.d/90mandos
65
75
STATEDIR:=$(DESTDIR)/var/lib/mandos
66
76
LIBDIR:=$(shell \
67
77
        for d in \
68
 
        "/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
 
78
        "/usr/lib/`dpkg-architecture \
 
79
                        -qDEB_HOST_MULTIARCH 2>/dev/null`" \
69
80
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
70
81
                if [ -d "$$d" -a "$$d" = "$${d%/}" ]; then \
71
82
                        echo "$(DESTDIR)$$d"; \
74
85
        done)
75
86
##
76
87
 
77
 
SYSTEMD:=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
78
 
TMPFILES:=$(DESTDIR)$(shell pkg-config systemd --variable=tmpfilesdir)
 
88
SYSTEMD:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
 
89
                        --variable=systemdsystemunitdir)
 
90
TMPFILES:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
 
91
                        --variable=tmpfilesdir)
 
92
SYSUSERS:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
 
93
                        --variable=sysusersdir)
79
94
 
80
 
GNUTLS_CFLAGS:=$(shell pkg-config --cflags-only-I gnutls)
81
 
GNUTLS_LIBS:=$(shell pkg-config --libs gnutls)
82
 
AVAHI_CFLAGS:=$(shell pkg-config --cflags-only-I avahi-core)
83
 
AVAHI_LIBS:=$(shell pkg-config --libs avahi-core)
 
95
GNUTLS_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I gnutls)
 
96
GNUTLS_LIBS:=$(shell $(PKG_CONFIG) --libs gnutls)
 
97
AVAHI_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I avahi-core)
 
98
AVAHI_LIBS:=$(shell $(PKG_CONFIG) --libs avahi-core)
84
99
GPGME_CFLAGS:=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
85
100
GPGME_LIBS:=$(shell gpgme-config --libs; getconf LFS_LIBS; \
86
101
        getconf LFS_LDFLAGS)
87
 
LIBNL3_CFLAGS:=$(shell pkg-config --cflags-only-I libnl-route-3.0)
88
 
LIBNL3_LIBS:=$(shell pkg-config --libs libnl-route-3.0)
 
102
LIBNL3_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I libnl-route-3.0)
 
103
LIBNL3_LIBS:=$(shell $(PKG_CONFIG) --libs libnl-route-3.0)
 
104
GLIB_CFLAGS:=$(shell $(PKG_CONFIG) --cflags glib-2.0)
 
105
GLIB_LIBS:=$(shell $(PKG_CONFIG) --libs glib-2.0)
89
106
 
90
107
# Do not change these two
91
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(SANITIZE) $(COVERAGE) \
92
 
        $(OPTIMIZE) $(LANGUAGE) -DVERSION='"$(version)"'
93
 
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
108
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
109
        $(LANGUAGE) $(FEATURES) -DVERSION='"$(version)"'
 
110
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(strip \
 
111
        ) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
94
112
 
95
113
# Commands to format a DocBook <refentry> document into a manual page
96
114
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
102
120
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
103
121
        $(notdir $<); \
104
122
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
105
 
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
106
 
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
107
 
        fi >/dev/null)
 
123
        && command -v man >/dev/null; then LANG=en_US.UTF-8 \
 
124
        MANWIDTH=80 man --warnings --encoding=UTF-8 --local-file \
 
125
        $(notdir $@); fi >/dev/null)
108
126
 
109
127
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
110
128
        --param make.year.ranges                1 \
123
141
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
124
142
        plugins.d/plymouth
125
143
PLUGIN_HELPERS:=plugin-helpers/mandos-client-iprouteadddel
126
 
CPROGS:=plugin-runner $(PLUGINS) $(PLUGIN_HELPERS)
 
144
CPROGS:=plugin-runner dracut-module/password-agent $(PLUGINS) \
 
145
        $(PLUGIN_HELPERS)
127
146
PROGS:=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
128
147
DOCS:=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
129
148
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
 
149
        dracut-module/password-agent.8mandos \
130
150
        plugins.d/mandos-client.8mandos \
131
151
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
132
152
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
204
224
                overview.xml legalnotice.xml
205
225
        $(DOCBOOKTOHTML)
206
226
 
 
227
dracut-module/password-agent.8mandos: \
 
228
                dracut-module/password-agent.xml common.ent \
 
229
                overview.xml legalnotice.xml
 
230
        $(DOCBOOKTOMAN)
 
231
dracut-module/password-agent.8mandos.xhtml: \
 
232
                dracut-module/password-agent.xml common.ent \
 
233
                overview.xml legalnotice.xml
 
234
        $(DOCBOOKTOHTML)
 
235
 
207
236
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
208
237
                                        common.ent \
209
238
                                        mandos-options.xml \
252
281
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
253
282
                $@)
254
283
 
255
 
# Need to add the GnuTLS, Avahi and GPGME libraries, and can't use
256
 
# -fsanitize=leak because GnuTLS and GPGME both leak memory.
 
284
# Need to add the GnuTLS, Avahi and GPGME libraries
257
285
plugins.d/mandos-client: plugins.d/mandos-client.c
258
 
        $(CC) $(filter-out -fsanitize=leak,$(CFLAGS)) $(strip\
259
 
        ) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) $(strip\
260
 
                ) $(CPPFLAGS) $(LDFLAGS) $(TARGET_ARCH) $^ $(strip\
261
 
                ) -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
262
 
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
 
286
        $(LINK.c) $^ $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(strip\
 
287
                ) $(GPGME_CFLAGS) $(GNUTLS_LIBS) $(strip\
 
288
                ) $(AVAHI_LIBS) $(GPGME_LIBS) $(LOADLIBES) $(strip\
 
289
                ) $(LDLIBS) -o $@
263
290
 
 
291
# Need to add the libnl-route library
264
292
plugin-helpers/mandos-client-iprouteadddel: plugin-helpers/mandos-client-iprouteadddel.c
265
293
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
266
294
                ) $(LOADLIBES) $(LDLIBS) -o $@
267
295
 
 
296
# Need to add the GLib and pthread libraries
 
297
dracut-module/password-agent: dracut-module/password-agent.c
 
298
        $(LINK.c) $(GLIB_CFLAGS) $^ $(GLIB_LIBS) -lpthread $(strip\
 
299
                ) $(LOADLIBES) $(LDLIBS) -o $@
 
300
 
268
301
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
269
302
        check run-client run-server install install-html \
270
303
        install-server install-client-nokey install-client uninstall \
279
312
maintainer-clean: clean
280
313
        -rm --force --recursive keydir confdir statedir
281
314
 
282
 
check:  all
 
315
check: all
283
316
        ./mandos --check
284
317
        ./mandos-ctl --check
 
318
        ./mandos-keygen --version
 
319
        ./plugin-runner --version
 
320
        ./plugin-helpers/mandos-client-iprouteadddel --version
 
321
        ./dracut-module/password-agent --test
285
322
 
286
323
# Run the client with a local config and key
287
 
run-client: all keydir/seckey.txt keydir/pubkey.txt
288
 
        @echo "###################################################################"
289
 
        @echo "# The following error messages are harmless and can be safely     #"
290
 
        @echo "# ignored:                                                        #"
291
 
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
292
 
        @echo "#                     setuid: Operation not permitted             #"
293
 
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
294
 
        @echo "# From mandos-client:                                             #"
295
 
        @echo "#             Failed to raise privileges: Operation not permitted #"
296
 
        @echo "#             Warning: network hook \"*\" exited with status *      #"
297
 
        @echo "#                                                                 #"
298
 
        @echo "# (The messages are caused by not running as root, but you should #"
299
 
        @echo "# NOT run \"make run-client\" as root unless you also unpacked and  #"
300
 
        @echo "# compiled Mandos as root, which is also NOT recommended.)        #"
301
 
        @echo "###################################################################"
 
324
run-client: all keydir/seckey.txt keydir/pubkey.txt \
 
325
                        keydir/tls-privkey.pem keydir/tls-pubkey.pem
 
326
        @echo '######################################################'
 
327
        @echo '# The following error messages are harmless and can  #'
 
328
        @echo '#  be safely ignored:                                #'
 
329
        @echo '## From plugin-runner:                               #'
 
330
        @echo '# setgid: Operation not permitted                    #'
 
331
        @echo '# setuid: Operation not permitted                    #'
 
332
        @echo '## From askpass-fifo:                                #'
 
333
        @echo '# mkfifo: Permission denied                          #'
 
334
        @echo '## From mandos-client:                               #'
 
335
        @echo '# Failed to raise privileges: Operation not permi... #'
 
336
        @echo '# Warning: network hook "*" exited with status *     #'
 
337
        @echo '# ioctl SIOCSIFFLAGS +IFF_UP: Operation not permi... #'
 
338
        @echo '# Failed to bring up interface "*": Operation not... #'
 
339
        @echo '#                                                    #'
 
340
        @echo '# (The messages are caused by not running as root,   #'
 
341
        @echo '# but you should NOT run "make run-client" as root   #'
 
342
        @echo '# unless you also unpacked and compiled Mandos as    #'
 
343
        @echo '# root, which is also NOT recommended.)              #'
 
344
        @echo '######################################################'
302
345
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
303
346
        ./plugin-runner --plugin-dir=plugins.d \
304
347
                --plugin-helper-dir=plugin-helpers \
305
348
                --config-file=plugin-runner.conf \
306
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
 
349
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--tls-privkey=keydir/tls-privkey.pem,--tls-pubkey=keydir/tls-pubkey.pem,--network-hook-dir=network-hooks.d \
307
350
                --env-for=mandos-client:GNOME_KEYRING_CONTROL= \
308
351
                $(CLIENTARGS)
309
352
 
310
353
# Used by run-client
311
 
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
 
354
keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem: mandos-keygen
312
355
        install --directory keydir
313
356
        ./mandos-keygen --dir keydir --force
314
357
 
321
364
confdir/mandos.conf: mandos.conf
322
365
        install --directory confdir
323
366
        install --mode=u=rw,go=r $^ $@
324
 
confdir/clients.conf: clients.conf keydir/seckey.txt
 
367
confdir/clients.conf: clients.conf keydir/seckey.txt keydir/tls-pubkey.pem
325
368
        install --directory confdir
326
369
        install --mode=u=rw $< $@
327
370
# Add a client password
344
387
        elif install --directory --mode=u=rwx $(STATEDIR); then \
345
388
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
346
389
        fi
347
 
        if [ "$(TMPFILES)" != "$(DESTDIR)" -a -d "$(TMPFILES)" ]; then \
 
390
        if [ "$(TMPFILES)" != "$(DESTDIR)" \
 
391
                        -a -d "$(TMPFILES)" ]; then \
348
392
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
349
393
                        $(TMPFILES)/mandos.conf; \
350
394
        fi
 
395
        if [ "$(SYSUSERS)" != "$(DESTDIR)" \
 
396
                        -a -d "$(SYSUSERS)" ]; then \
 
397
                install --mode=u=rw,go=r sysusers.d-mandos.conf \
 
398
                        $(SYSUSERS)/mandos.conf; \
 
399
        fi
351
400
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
352
401
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
353
402
                mandos-ctl
397
446
        install --mode=u=rwx,go=rx \
398
447
                --target-directory=$(LIBDIR)/mandos plugin-runner
399
448
        install --mode=u=rwx,go=rx \
400
 
                --target-directory=$(LIBDIR)/mandos mandos-to-cryptroot-unlock
 
449
                --target-directory=$(LIBDIR)/mandos \
 
450
                mandos-to-cryptroot-unlock
401
451
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
402
452
                mandos-keygen
403
453
        install --mode=u=rwx,go=rx \
423
473
                plugin-helpers/mandos-client-iprouteadddel
424
474
        install initramfs-tools-hook \
425
475
                $(INITRAMFSTOOLS)/hooks/mandos
426
 
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
427
 
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
428
476
        install --mode=u=rw,go=r initramfs-tools-conf \
429
477
                $(INITRAMFSTOOLS)/conf.d/mandos-conf
 
478
        install --mode=u=rw,go=r initramfs-tools-conf-hook \
 
479
                $(INITRAMFSTOOLS)/conf-hooks.d/zz-mandos
430
480
        install initramfs-tools-script \
431
481
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
432
482
        install initramfs-tools-script-stop \
433
483
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos
 
484
        install --directory $(DRACUTMODULE)
 
485
        install --mode=u=rw,go=r --target-directory=$(DRACUTMODULE) \
 
486
                dracut-module/ask-password-mandos.path \
 
487
                dracut-module/ask-password-mandos.service
 
488
        install --mode=u=rwxs,go=rx \
 
489
                --target-directory=$(DRACUTMODULE) \
 
490
                dracut-module/module-setup.sh \
 
491
                dracut-module/cmdline-mandos.sh \
 
492
                dracut-module/password-agent
434
493
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
435
494
        gzip --best --to-stdout mandos-keygen.8 \
436
495
                > $(MANDIR)/man8/mandos-keygen.8.gz
448
507
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
449
508
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
450
509
                > $(MANDIR)/man8/plymouth.8mandos.gz
 
510
        gzip --best --to-stdout dracut-module/password-agent.8mandos \
 
511
                > $(MANDIR)/man8/password-agent.8mandos.gz
451
512
 
452
513
install-client: install-client-nokey
453
514
# Post-installation stuff
454
515
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
455
 
        update-initramfs -k all -u
 
516
        if command -v update-initramfs >/dev/null; then \
 
517
            update-initramfs -k all -u; \
 
518
        elif command -v dracut >/dev/null; then \
 
519
            for initrd in $(DESTDIR)/boot/initr*-$(LINUXVERSION); do \
 
520
                if [ -w "$$initrd" ]; then \
 
521
                    chmod go-r "$$initrd"; \
 
522
                    dracut --force "$$initrd"; \
 
523
                fi; \
 
524
            done; \
 
525
        fi
456
526
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
457
527
 
458
528
uninstall: uninstall-server uninstall-client
485
555
                $(INITRAMFSTOOLS)/hooks/mandos \
486
556
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
487
557
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
558
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos \
 
559
                $(DRACUTMODULE)/ask-password-mandos.path \
 
560
                $(DRACUTMODULE)/ask-password-mandos.service \
 
561
                $(DRACUTMODULE)/module-setup.sh \
 
562
                $(DRACUTMODULE)/cmdline-mandos.sh \
 
563
                $(DRACUTMODULE)/password-agent \
488
564
                $(MANDIR)/man8/mandos-keygen.8.gz \
489
565
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
490
566
                $(MANDIR)/man8/mandos-client.8mandos.gz
493
569
                $(MANDIR)/man8/splashy.8mandos.gz \
494
570
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
495
571
                $(MANDIR)/man8/plymouth.8mandos.gz \
 
572
                $(MANDIR)/man8/password-agent.8mandos.gz \
496
573
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
497
 
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
498
 
        update-initramfs -k all -u
 
574
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR) $(DRACUTMODULE)
 
575
        if command -v update-initramfs >/dev/null; then \
 
576
            update-initramfs -k all -u; \
 
577
        elif command -v dracut >/dev/null; then \
 
578
            for initrd in $(DESTDIR)/boot/initr*-$(LINUXVERSION); do \
 
579
                test -w "$$initrd" && dracut --force "$$initrd"; \
 
580
            done; \
 
581
        fi
499
582
 
500
583
purge: purge-server purge-client
501
584
 
510
593
        -rmdir $(CONFDIR)
511
594
 
512
595
purge-client: uninstall-client
513
 
        -shred --remove $(KEYDIR)/seckey.txt
 
596
        -shred --remove $(KEYDIR)/seckey.txt $(KEYDIR)/tls-privkey.pem
514
597
        -rm --force $(CONFDIR)/plugin-runner.conf \
515
 
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
 
598
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt \
 
599
                $(KEYDIR)/tls-pubkey.txt $(KEYDIR)/tls-privkey.txt
516
600
        -rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)