/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-04-14 03:36:05 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090414033605-ao45swlzyvmahc8y
Minor code cleanup, and a bug fix.

* mandos: Added blank second line in doc strings.
  (SO_BINDTODEVICE): New global constant.
  (TCP_handler): Renamed to "ClientHandler".  All users changed.
  (ClientHandler.handle): Get GnuTLS priority directly from
                          server.gnutls_priority instead of
                          server.settings["priority"].
  (IPv6_TCPServer): Do not use super() anywhere.
  (IPv6_TCPServer.__init__) Do not receive "settings" dict, get all
                            the relevant settings separately as
                            keyword arguments.  All callers changed.
  (IPv6_TCPServer.server_bind): Use global SO_BINDTODEVICE.  Bug fix:
                               add NUL character to interface name.
                               Use "self.interface" directly instead
                               of "self.settings['interface']".
  (IPv6_TCPServer.handle_ipc): Use "self.use_dbus" directly instead of
                               "self.settings['use_dbus']".

Show diffs side-by-side

added added

removed removed

Lines of Context:
initramfs-tools-script
10
10
# eventually be "/scripts/init-premount/mandos" in the initrd.img
11
11
# file.
12
12
 
 
13
# No initramfs pre-requirements.
13
14
PREREQ="udev"
14
15
prereqs()
15
16
{
57
58
# Get DEVICE from /conf/initramfs.conf and other files
58
59
. /conf/initramfs.conf
59
60
for conf in /conf/conf.d/*; do
60
 
    [ -f "${conf}" ] && . "${conf}"
 
61
    [ -f ${conf} ] && . ${conf}
61
62
done
62
63
if [ -e /conf/param.conf ]; then
63
64
    . /conf/param.conf
94
95
# If we are connecting directly, run "configure_networking" (from
95
96
# /scripts/functions); it needs IPOPTS and DEVICE
96
97
if [ "${connect+set}" = set ]; then
97
 
    set +e                      # Required by library functions
98
98
    configure_networking
99
 
    set -e
100
99
    if [ -n "$connect" ]; then
101
100
        cat <<-EOF >>/conf/conf.d/mandos/plugin-runner.conf
102
101
        
110
109
 
111
110
# Our keyscript
112
111
mandos=/lib/mandos/plugin-runner
113
 
test -x "$mandos"
114
112
 
115
113
# parse /conf/conf.d/cryptroot.  Format:
116
114
# target=sda2_crypt,source=/dev/sda2,key=none,keyscript=/foo/bar/baz
117
115
exec 3>/conf/conf.d/cryptroot.mandos
118
 
while read -r options; do
 
116
while read options; do
119
117
    newopts=""
120
118
    # Split option line on commas
121
119
    old_ifs="$IFS"