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

  • Committer: Teddy Hogeborn
  • Date: 2009-01-31 10:33:17 UTC
  • mfrom: (24.1.129 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20090131103317-wzqvyr532sjcjt7u
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-script
14
14
PREREQ=""
15
15
prereqs()
16
16
{
17
 
    echo "$PREREQ"
 
17
     echo "$PREREQ"
18
18
}
19
19
 
20
20
case $1 in
21
21
prereqs)
22
 
        prereqs
23
 
        exit 0
24
 
        ;;
 
22
     prereqs
 
23
     exit 0
 
24
     ;;
25
25
esac
26
26
 
27
27
for param in `cat /proc/cmdline`; do
32
32
 
33
33
chmod a=rwxt /tmp
34
34
 
35
 
test -r /conf/conf.d/cryptroot
36
 
test -w /conf/conf.d
 
35
test -w /conf/conf.d/cryptroot
37
36
 
38
37
# Do not replace cryptroot file unless we need to.
39
38
replace_cryptroot=no