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

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
 
# target=sda2_crypt,source=/dev/sda2,rootdev,key=none,keyscript=/foo/bar/baz
117
 
# Is the root device specially marked?
118
 
changeall=yes
119
 
while read -r options; do
120
 
    case "$options" in
121
 
        rootdev,*|*,rootdev,*|*,rootdev)
122
 
            # If the root device is specially marked, don't change all
123
 
            # lines in crypttab by default.
124
 
            changeall=no
125
 
            ;;
126
 
    esac
127
 
done < /conf/conf.d/cryptroot
128
 
 
 
114
# target=sda2_crypt,source=/dev/sda2,key=none,keyscript=/foo/bar/baz
129
115
exec 3>/conf/conf.d/cryptroot.mandos
130
 
while read -r options; do
 
116
while read options; do
131
117
    newopts=""
132
 
    keyscript=""
133
 
    changethis="$changeall"
134
118
    # Split option line on commas
135
119
    old_ifs="$IFS"
136
120
    IFS="$IFS,"
142
126
                newopts="$newopts,$opt"
143
127
                ;;
144
128
            "") : ;;
145
 
            # Always use Mandos on the root device, if marked
146
 
            rootdev)
147
 
                changethis=yes
148
 
                newopts="$newopts,$opt"
149
 
                ;;
150
 
            # Don't use Mandos on resume device, if marked
151
 
            resumedev)
152
 
                changethis=no
153
 
                newopts="$newopts,$opt"
154
 
                ;;
155
129
            *)
156
130
                newopts="$newopts,$opt"
157
131
                ;;
160
134
    IFS="$old_ifs"
161
135
    unset old_ifs
162
136
    # If there was no keyscript option, add one.
163
 
    if [ "$changethis" = yes ] && [ -z "$keyscript" ]; then
 
137
    if [ -z "$keyscript" ]; then
164
138
        replace_cryptroot=yes
165
139
        newopts="$newopts,keyscript=$mandos"
166
140
    fi