/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: 2012-01-15 20:27:28 UTC
  • Revision ID: teddy@recompile.se-20120115202728-185929ww2r84s8xg
* DBUS-API (se.recompile.Mandos.Client.LastCheckerStatus): New
                                                           property.
* mandos (Client.last_checker_status): Use -2 instead of None to match
                                       D-Bus property.  All users
                                       changed.
  (Client.checked_ok): Remove "timeout" argument and call
                       "self.bump_timeout()" instead.
  (Client.bump_timeout): New; separated out from "checked_ok".
  (ClientDBus.last_checker_status): Hook to a D-Bus property.
  (ClientDBus.LastCheckerStatus_dbus_property): New D-Bus property.
  (ClientHandler.handle): Call client.bump_timeout() instead of
                          client.checked_ok().

Show diffs side-by-side

added added

removed removed

Lines of Context:
initramfs-tools-script
108
108
 
109
109
# Our keyscript
110
110
mandos=/lib/mandos/plugin-runner
 
111
test -x "$mandos"
111
112
 
112
113
# parse /conf/conf.d/cryptroot.  Format:
113
114
# target=sda2_crypt,source=/dev/sda2,key=none,keyscript=/foo/bar/baz
149
150
else
150
151
    rm /conf/conf.d/cryptroot.mandos
151
152
fi
152
 
 
153
 
## Work around Debian bug #633582: <http://bugs.debian.org/633582>
154
 
# First determine the mandos user and group ID
155
 
mandos_user="65534"
156
 
mandos_group="65534"
157
 
while read line; do
158
 
    line="${line%%#*}"
159
 
    TEMP=`getopt --quiet --longoptions userid:,groupid: -- $line`
160
 
    eval set -- "$TEMP"
161
 
    while true; do
162
 
        case "$1" in
163
 
            --userid) mandos_user="$2"; shift 2;;
164
 
            --groupid) mandos_group="$2"; shift 2;;
165
 
            --) shift; break;;
166
 
        esac
167
 
    done
168
 
done < /conf/conf.d/mandos/plugin-runner.conf
169
 
chown "${mandos_user}:${mandos_group}" \
170
 
    /lib/mandos/plugins.d \
171
 
    /conf/conf.d/mandos/pubkey.txt \
172
 
    /conf/conf.d/mandos/seckey.txt