/mandos/trunk

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

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Teddy Hogeborn
  • Date: 2019-07-29 16:35:53 UTC
  • Revision ID: teddy@recompile.se-20190729163553-1i442i2cbx64c537
Make tests and man page examples match

Make the tests test_manual_page_example[1-5] match exactly what is
written in the manual page, and add comments to manual page as
reminders to keep tests and manual page examples in sync.

* mandos-ctl (Test_commands_from_options.test_manual_page_example_1):
  Remove "--verbose" option, since the manual does not have it as the
  first example, and change assertion to match.
* mandos-ctl.xml (EXAMPLE): Add comments to all examples documenting
  which test function they correspond to.  Also remove unnecessary
  quotes from option arguments in fourth example, and clarify language
  slightly in fifth example.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
1
 
WARN=-O -Wall -Wextra -Wdouble-promotion -Wformat=2 -Winit-self \
 
1
WARN:=-O -Wall -Wextra -Wdouble-promotion -Wformat=2 -Winit-self \
2
2
        -Wmissing-include-dirs -Wswitch-default -Wswitch-enum \
3
3
        -Wunused -Wuninitialized -Wstrict-overflow=5 \
4
4
        -Wsuggest-attribute=pure -Wsuggest-attribute=const \
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
 
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)))
 
19
# <https://developerblog.redhat.com/2014/10/16/gcc-undefined-behavior-sanitizer-ubsan/>
 
20
ALL_SANITIZE_OPTIONS:=-fsanitize=leak -fsanitize=undefined \
 
21
        -fsanitize=shift -fsanitize=integer-divide-by-zero \
 
22
        -fsanitize=unreachable -fsanitize=vla-bound -fsanitize=null \
 
23
        -fsanitize=return -fsanitize=signed-integer-overflow \
 
24
        -fsanitize=bounds -fsanitize=alignment \
 
25
        -fsanitize=object-size -fsanitize=float-divide-by-zero \
 
26
        -fsanitize=float-cast-overflow -fsanitize=nonnull-attribute \
 
27
        -fsanitize=returns-nonnull-attribute -fsanitize=bool \
 
28
        -fsanitize=enum -fsanitize-address-use-after-scope
 
29
 
14
30
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
15
 
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
16
 
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
17
 
LINK_FORTIFY_LD=-z relro -z now
18
 
LINK_FORTIFY=
 
31
# and <https://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
 
32
FORTIFY:=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
 
33
LINK_FORTIFY_LD:=-z relro -z now
 
34
LINK_FORTIFY:=
19
35
 
20
36
# If BROKEN_PIE is set, do not build with -pie
21
37
ifndef BROKEN_PIE
23
39
LINK_FORTIFY += -pie
24
40
endif
25
41
#COVERAGE=--coverage
26
 
OPTIMIZE=-Os -fno-strict-aliasing
27
 
LANGUAGE=-std=gnu11
28
 
htmldir=man
29
 
version=1.7.0
30
 
SED=sed
 
42
OPTIMIZE:=-Os -fno-strict-aliasing
 
43
LANGUAGE:=-std=gnu11
 
44
htmldir:=man
 
45
version:=1.8.4
 
46
SED:=sed
31
47
 
32
 
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
33
 
GROUP=$(firstword $(subst :, ,$(shell getent group _mandos || getent group nobody || echo 65534)))
 
48
USER:=$(firstword $(subst :, ,$(shell getent passwd _mandos \
 
49
        || getent passwd nobody || echo 65534)))
 
50
GROUP:=$(firstword $(subst :, ,$(shell getent group _mandos \
 
51
        || getent group nogroup || echo 65534)))
34
52
 
35
53
## Use these settings for a traditional /usr/local install
36
 
# PREFIX=$(DESTDIR)/usr/local
37
 
# CONFDIR=$(DESTDIR)/etc/mandos
38
 
# KEYDIR=$(DESTDIR)/etc/mandos/keys
39
 
# MANDIR=$(PREFIX)/man
40
 
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
41
 
# STATEDIR=$(DESTDIR)/var/lib/mandos
42
 
# LIBDIR=$(PREFIX)/lib
 
54
# PREFIX:=$(DESTDIR)/usr/local
 
55
# CONFDIR:=$(DESTDIR)/etc/mandos
 
56
# KEYDIR:=$(DESTDIR)/etc/mandos/keys
 
57
# MANDIR:=$(PREFIX)/man
 
58
# INITRAMFSTOOLS:=$(DESTDIR)/etc/initramfs-tools
 
59
# DRACUTMODULE:=$(DESTDIR)/usr/lib/dracut/modules.d/90mandos
 
60
# STATEDIR:=$(DESTDIR)/var/lib/mandos
 
61
# LIBDIR:=$(PREFIX)/lib
43
62
##
44
63
 
45
64
## These settings are for a package-type install
46
 
PREFIX=$(DESTDIR)/usr
47
 
CONFDIR=$(DESTDIR)/etc/mandos
48
 
KEYDIR=$(DESTDIR)/etc/keys/mandos
49
 
MANDIR=$(PREFIX)/share/man
50
 
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
51
 
STATEDIR=$(DESTDIR)/var/lib/mandos
52
 
LIBDIR=$(shell \
 
65
PREFIX:=$(DESTDIR)/usr
 
66
CONFDIR:=$(DESTDIR)/etc/mandos
 
67
KEYDIR:=$(DESTDIR)/etc/keys/mandos
 
68
MANDIR:=$(PREFIX)/share/man
 
69
INITRAMFSTOOLS:=$(DESTDIR)/usr/share/initramfs-tools
 
70
DRACUTMODULE:=$(DESTDIR)/usr/lib/dracut/modules.d/90mandos
 
71
STATEDIR:=$(DESTDIR)/var/lib/mandos
 
72
LIBDIR:=$(shell \
53
73
        for d in \
54
74
        "/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
55
75
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
60
80
        done)
61
81
##
62
82
 
63
 
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
 
83
SYSTEMD:=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
 
84
TMPFILES:=$(DESTDIR)$(shell pkg-config systemd --variable=tmpfilesdir)
64
85
 
65
 
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
66
 
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
67
 
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
68
 
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
69
 
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
70
 
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
 
86
GNUTLS_CFLAGS:=$(shell pkg-config --cflags-only-I gnutls)
 
87
GNUTLS_LIBS:=$(shell pkg-config --libs gnutls)
 
88
AVAHI_CFLAGS:=$(shell pkg-config --cflags-only-I avahi-core)
 
89
AVAHI_LIBS:=$(shell pkg-config --libs avahi-core)
 
90
GPGME_CFLAGS:=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
 
91
GPGME_LIBS:=$(shell gpgme-config --libs; getconf LFS_LIBS; \
71
92
        getconf LFS_LDFLAGS)
72
 
LIBNL3_CFLAGS=$(shell pkg-config --cflags-only-I libnl-route-3.0)
73
 
LIBNL3_LIBS=$(shell pkg-config --libs libnl-route-3.0)
 
93
LIBNL3_CFLAGS:=$(shell pkg-config --cflags-only-I libnl-route-3.0)
 
94
LIBNL3_LIBS:=$(shell pkg-config --libs libnl-route-3.0)
 
95
GLIB_CFLAGS:=$(shell pkg-config --cflags glib-2.0)
 
96
GLIB_LIBS:=$(shell pkg-config --libs glib-2.0)
74
97
 
75
98
# Do not change these two
76
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
77
 
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
78
 
        -DVERSION='"$(version)"'
79
 
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
99
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) \
 
100
        $(OPTIMIZE) $(LANGUAGE) -DVERSION='"$(version)"'
 
101
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(strip \
 
102
        ) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
80
103
 
81
104
# Commands to format a DocBook <refentry> document into a manual page
82
105
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
88
111
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
89
112
        $(notdir $<); \
90
113
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
91
 
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
92
 
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
93
 
        fi >/dev/null)
 
114
        && command -v man >/dev/null; then LANG=en_US.UTF-8 \
 
115
        MANWIDTH=80 man --warnings --encoding=UTF-8 --local-file \
 
116
        $(notdir $@); fi >/dev/null)
94
117
 
95
118
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
96
119
        --param make.year.ranges                1 \
102
125
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
103
126
        $<; $(HTMLPOST) $@)
104
127
# Fix citerefentry links
105
 
HTMLPOST=$(SED) --in-place \
 
128
HTMLPOST:=$(SED) --in-place \
106
129
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
107
130
 
108
 
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
 
131
PLUGINS:=plugins.d/password-prompt plugins.d/mandos-client \
109
132
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
110
133
        plugins.d/plymouth
111
 
PLUGIN_HELPERS=plugin-helpers/mandos-client-iprouteadddel
112
 
CPROGS=plugin-runner $(PLUGINS) $(PLUGIN_HELPERS)
113
 
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
114
 
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
 
134
PLUGIN_HELPERS:=plugin-helpers/mandos-client-iprouteadddel
 
135
CPROGS:=plugin-runner dracut-module/password-agent $(PLUGINS) \
 
136
        $(PLUGIN_HELPERS)
 
137
PROGS:=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
 
138
DOCS:=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
115
139
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
 
140
        dracut-module/password-agent.8mandos \
116
141
        plugins.d/mandos-client.8mandos \
117
142
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
118
143
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
119
144
        plugins.d/plymouth.8mandos intro.8mandos
120
145
 
121
 
htmldocs=$(addsuffix .xhtml,$(DOCS))
 
146
htmldocs:=$(addsuffix .xhtml,$(DOCS))
122
147
 
123
 
objects=$(addsuffix .o,$(CPROGS))
 
148
objects:=$(addsuffix .o,$(CPROGS))
124
149
 
125
150
all: $(PROGS) mandos.lsm
126
151
 
190
215
                overview.xml legalnotice.xml
191
216
        $(DOCBOOKTOHTML)
192
217
 
 
218
dracut-module/password-agent.8mandos: \
 
219
                dracut-module/password-agent.xml common.ent \
 
220
                overview.xml legalnotice.xml
 
221
        $(DOCBOOKTOMAN)
 
222
dracut-module/password-agent.8mandos.xhtml: \
 
223
                dracut-module/password-agent.xml common.ent \
 
224
                overview.xml legalnotice.xml
 
225
        $(DOCBOOKTOHTML)
 
226
 
193
227
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
194
228
                                        common.ent \
195
229
                                        mandos-options.xml \
238
272
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
239
273
                $@)
240
274
 
 
275
# Need to add the GnuTLS, Avahi and GPGME libraries
241
276
plugins.d/mandos-client: plugins.d/mandos-client.c
242
 
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
243
 
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
 
277
        $(LINK.c) $^ $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(strip\
 
278
                ) $(GPGME_CFLAGS) $(GNUTLS_LIBS) $(strip\
 
279
                ) $(AVAHI_LIBS) $(GPGME_LIBS) $(LOADLIBES) $(strip\
 
280
                ) $(LDLIBS) -o $@
244
281
 
 
282
# Need to add the libnl-route library
245
283
plugin-helpers/mandos-client-iprouteadddel: plugin-helpers/mandos-client-iprouteadddel.c
246
284
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
247
285
                ) $(LOADLIBES) $(LDLIBS) -o $@
248
286
 
 
287
# Need to add the GLib and pthread libraries
 
288
dracut-module/password-agent: dracut-module/password-agent.c
 
289
        $(LINK.c) $(GLIB_CFLAGS) $^ $(GLIB_LIBS) -lpthread $(strip\
 
290
                ) $(LOADLIBES) $(LDLIBS) -o $@
 
291
 
249
292
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
250
293
        check run-client run-server install install-html \
251
294
        install-server install-client-nokey install-client uninstall \
260
303
maintainer-clean: clean
261
304
        -rm --force --recursive keydir confdir statedir
262
305
 
263
 
check:  all
 
306
check: all
264
307
        ./mandos --check
265
308
        ./mandos-ctl --check
 
309
        ./mandos-keygen --version
 
310
        ./plugin-runner --version
 
311
        ./plugin-helpers/mandos-client-iprouteadddel --version
 
312
        ./dracut-module/password-agent --test
266
313
 
267
314
# Run the client with a local config and key
268
 
run-client: all keydir/seckey.txt keydir/pubkey.txt
 
315
run-client: all keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem
269
316
        @echo "###################################################################"
270
317
        @echo "# The following error messages are harmless and can be safely     #"
271
 
        @echo "# ignored.  The messages are caused by not running as root, but   #"
272
 
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
273
 
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
 
318
        @echo "# ignored:                                                        #"
274
319
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
275
320
        @echo "#                     setuid: Operation not permitted             #"
276
321
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
277
322
        @echo "# From mandos-client:                                             #"
278
323
        @echo "#             Failed to raise privileges: Operation not permitted #"
279
324
        @echo "#             Warning: network hook \"*\" exited with status *      #"
 
325
        @echo "#                                                                 #"
 
326
        @echo "# (The messages are caused by not running as root, but you should #"
 
327
        @echo "# NOT run \"make run-client\" as root unless you also unpacked and  #"
 
328
        @echo "# compiled Mandos as root, which is also NOT recommended.)        #"
280
329
        @echo "###################################################################"
281
330
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
282
331
        ./plugin-runner --plugin-dir=plugins.d \
283
332
                --plugin-helper-dir=plugin-helpers \
284
333
                --config-file=plugin-runner.conf \
285
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
 
334
                --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 \
286
335
                --env-for=mandos-client:GNOME_KEYRING_CONTROL= \
287
336
                $(CLIENTARGS)
288
337
 
289
338
# Used by run-client
290
 
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
 
339
keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem: mandos-keygen
291
340
        install --directory keydir
292
341
        ./mandos-keygen --dir keydir --force
293
342
 
300
349
confdir/mandos.conf: mandos.conf
301
350
        install --directory confdir
302
351
        install --mode=u=rw,go=r $^ $@
303
 
confdir/clients.conf: clients.conf keydir/seckey.txt
 
352
confdir/clients.conf: clients.conf keydir/seckey.txt keydir/tls-pubkey.pem
304
353
        install --directory confdir
305
354
        install --mode=u=rw $< $@
306
355
# Add a client password
323
372
        elif install --directory --mode=u=rwx $(STATEDIR); then \
324
373
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
325
374
        fi
 
375
        if [ "$(TMPFILES)" != "$(DESTDIR)" -a -d "$(TMPFILES)" ]; then \
 
376
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
 
377
                        $(TMPFILES)/mandos.conf; \
 
378
        fi
326
379
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
327
380
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
328
381
                mandos-ctl
364
417
                $(LIBDIR)/mandos/plugin-helpers
365
418
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
366
419
                install --mode=u=rwx \
367
 
                        --directory "$(CONFDIR)/plugins.d"; \
368
 
                install --directory "$(CONFDIR)/plugin-helpers"; \
 
420
                        --directory "$(CONFDIR)/plugins.d" \
 
421
                        "$(CONFDIR)/plugin-helpers"; \
369
422
        fi
370
423
        install --mode=u=rwx,go=rx --directory \
371
424
                "$(CONFDIR)/network-hooks.d"
372
425
        install --mode=u=rwx,go=rx \
373
426
                --target-directory=$(LIBDIR)/mandos plugin-runner
 
427
        install --mode=u=rwx,go=rx \
 
428
                --target-directory=$(LIBDIR)/mandos mandos-to-cryptroot-unlock
374
429
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
375
430
                mandos-keygen
376
431
        install --mode=u=rwx,go=rx \
391
446
        install --mode=u=rwxs,go=rx \
392
447
                --target-directory=$(LIBDIR)/mandos/plugins.d \
393
448
                plugins.d/plymouth
394
 
        install --mode=u=rwxs,go=rx \
 
449
        install --mode=u=rwx,go=rx \
395
450
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
396
451
                plugin-helpers/mandos-client-iprouteadddel
397
452
        install initramfs-tools-hook \
398
453
                $(INITRAMFSTOOLS)/hooks/mandos
399
 
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
400
 
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
 
454
        install --mode=u=rw,go=r initramfs-tools-conf \
 
455
                $(INITRAMFSTOOLS)/conf.d/mandos-conf
 
456
        install --mode=u=rw,go=r initramfs-tools-conf-hook \
 
457
                $(INITRAMFSTOOLS)/conf-hooks.d/zz-mandos
401
458
        install initramfs-tools-script \
402
459
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
 
460
        install initramfs-tools-script-stop \
 
461
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos
 
462
        install --directory $(DRACUTMODULE)
 
463
        install --mode=u=rw,go=r --target-directory=$(DRACUTMODULE) \
 
464
                dracut-module/ask-password-mandos.path \
 
465
                dracut-module/ask-password-mandos.service
 
466
        install --mode=u=rwxs,go=rx \
 
467
                --target-directory=$(DRACUTMODULE) \
 
468
                dracut-module/module-setup.sh \
 
469
                dracut-module/cmdline-mandos.sh \
 
470
                dracut-module/password-agent
403
471
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
404
472
        gzip --best --to-stdout mandos-keygen.8 \
405
473
                > $(MANDIR)/man8/mandos-keygen.8.gz
417
485
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
418
486
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
419
487
                > $(MANDIR)/man8/plymouth.8mandos.gz
 
488
        gzip --best --to-stdout dracut-module/password-agent.8mandos \
 
489
                > $(MANDIR)/man8/password-agent.8mandos.gz
420
490
 
421
491
install-client: install-client-nokey
422
492
# Post-installation stuff
423
493
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
424
 
        update-initramfs -k all -u
 
494
        if command -v update-initramfs >/dev/null; then \
 
495
            update-initramfs -k all -u; \
 
496
        elif command -v dracut >/dev/null; then \
 
497
            for initrd in $(DESTDIR)/boot/initr*-$(shell uname --kernel-release); do \
 
498
                if [ -w "$$initrd" ]; then \
 
499
                    chmod go-r "$$initrd"; \
 
500
                    dracut --force "$$initrd"; \
 
501
                fi; \
 
502
            done; \
 
503
        fi
425
504
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
426
505
 
427
506
uninstall: uninstall-server uninstall-client
454
533
                $(INITRAMFSTOOLS)/hooks/mandos \
455
534
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
456
535
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
536
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos \
 
537
                $(DRACUTMODULE)/ask-password-mandos.path \
 
538
                $(DRACUTMODULE)/ask-password-mandos.service \
 
539
                $(DRACUTMODULE)/module-setup.sh \
 
540
                $(DRACUTMODULE)/cmdline-mandos.sh \
 
541
                $(DRACUTMODULE)/password-agent \
457
542
                $(MANDIR)/man8/mandos-keygen.8.gz \
458
543
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
459
544
                $(MANDIR)/man8/mandos-client.8mandos.gz
462
547
                $(MANDIR)/man8/splashy.8mandos.gz \
463
548
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
464
549
                $(MANDIR)/man8/plymouth.8mandos.gz \
 
550
                $(MANDIR)/man8/password-agent.8mandos.gz \
465
551
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
466
 
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
467
 
        update-initramfs -k all -u
 
552
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR) $(DRACUTMODULE)
 
553
        if command -v update-initramfs >/dev/null; then \
 
554
            update-initramfs -k all -u; \
 
555
        elif command -v dracut >/dev/null; then \
 
556
            for initrd in $(DESTDIR)/boot/initr*-$(shell uname --kernel-release); do \
 
557
                test -w "$$initrd" && dracut --force "$$initrd"; \
 
558
            done; \
 
559
        fi
468
560
 
469
561
purge: purge-server purge-client
470
562
 
479
571
        -rmdir $(CONFDIR)
480
572
 
481
573
purge-client: uninstall-client
482
 
        -shred --remove $(KEYDIR)/seckey.txt
 
574
        -shred --remove $(KEYDIR)/seckey.txt $(KEYDIR)/tls-privkey.pem
483
575
        -rm --force $(CONFDIR)/plugin-runner.conf \
484
 
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
 
576
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt \
 
577
                $(KEYDIR)/tls-pubkey.txt $(KEYDIR)/tls-privkey.txt
485
578
        -rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)