/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

* debian/mandos-client.README.Debian: Document network hook facility.
* debian/mandos-client.docs (network-hooks.d): Added.
* initramfs-tools-hook: Also pass VERBOSITY to network hook.
* plugins.d/mandos-client.xml (DESCRIPTION): Document network
                                             interface selection
                                             algorithm.
  (OPTIONS/--interface): Refer to NETWORK HOOKS section.
  (OVERVIEW): Refer to password-prompt(8mandos) explicitly.
  (NETWORK HOOKS): New section.
  (FILES): Add "/lib/mandos/network-hooks.d".

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
250
250
        @echo "###################################################################"
251
251
        ./plugin-runner --plugin-dir=plugins.d \
252
252
                --config-file=plugin-runner.conf \
253
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
 
253
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
254
254
                $(CLIENTARGS)
255
255
 
256
256
# Used by run-client
260
260
 
261
261
# Run the server with a local config
262
262
run-server: confdir/mandos.conf confdir/clients.conf
 
263
        @echo "#################################################################"
 
264
        @echo "# NOTE: Please IGNORE the error about \"Could not open file      #"
 
265
        @echo "# u'/var/run/mandos.pid'\" -  it is harmless and is caused by    #"
 
266
        @echo "# the server not running as root.  Do NOT run \"make run-server\" #"
 
267
        @echo "# server as root if you didn't also unpack and compile it thus. #"
 
268
        @echo "#################################################################"
263
269
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
264
270
 
265
271
# Used by run-server