/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 initramfs-tools-hook

Merge from Björn:

* mandos-ctl: New option "--remove-client".  Only default to listing
              clients if no clients were given on the command line.
* plugins.d/mandos-client.c: Lower kernel log level while bringing up
                             network interface.  New option "--delay"
                             to control the maximum delay to wait for
                             running interface.
* plugins.d/mandos-client.xml (SYNOPSIS, OPTIONS): New option
                                                   "--delay".

Show diffs side-by-side

added added

removed removed

Lines of Context:
initramfs-tools-hook
51
51
    exit 1
52
52
fi
53
53
 
54
 
mandos_user="`{ getent passwd mandos \
 
54
mandos_user="`{ getent passwd _mandos \
 
55
                || getent passwd mandos \
55
56
                || getent passwd nobody \
56
57
                || echo ::65534::::; } \
57
58
        | awk --field-separator=: '{ print $3 }'`" 
58
 
mandos_group="`{ getent group mandos \
 
59
mandos_group="`{ getent group _mandos \
 
60
                || getent group mandos \
59
61
                || getent group nogroup \
60
62
                || echo ::65534:; } \
61
63
        | awk --field-separator=: '{ print $3 }'`"