/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-02-03 22:41:49 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090203224149-fc1301jojmusbzlx
* Makefile (run-server): Use "--no-dbus" unconditionally.

* initramfs-tools-script: Correct tests for writable "/conf/conf.d".

* mandos: Add process ID number to logging messages.
  (IPv6_TCPServer.server_bind): Use plain "raise".
  (main): Do not try to handle SIGSEGV; it does not work.  Use plain
         "raise".  Log KeyboardInterrupt and server exit.

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
for param in `cat /proc/cmdline`; do
 
28
    case "$param" in
 
29
        mandos=off) exit 0;;
 
30
    esac
 
31
done
 
32
 
27
33
chmod a=rwxt /tmp
28
34
 
29
 
test -w /conf/conf.d/cryptroot
 
35
test -r /conf/conf.d/cryptroot
 
36
test -w /conf/conf.d
30
37
 
31
38
# Do not replace cryptroot file unless we need to.
32
39
replace_cryptroot=no