/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: 2016-03-05 21:46:00 UTC
  • Revision ID: teddy@recompile.se-20160305214600-2d7peg8qb5xhpi64
Fix incorrect documentation of minor limitation

* mandos-monitor.xml (BUGS): The name which is hard-coded is the D-Bus
                             *bus* name, not the service name.  Fix
                             the documentation.

Show diffs side-by-side

added added

removed removed

Lines of Context:
initramfs-tools-script
94
94
# If we are connecting directly, run "configure_networking" (from
95
95
# /scripts/functions); it needs IPOPTS and DEVICE
96
96
if [ "${connect+set}" = set ]; then
 
97
    set +e                      # Required by library functions
97
98
    configure_networking
 
99
    set -e
98
100
    if [ -n "$connect" ]; then
99
101
        cat <<-EOF >>/conf/conf.d/mandos/plugin-runner.conf
100
102
        
108
110
 
109
111
# Our keyscript
110
112
mandos=/lib/mandos/plugin-runner
 
113
test -x "$mandos"
111
114
 
112
115
# parse /conf/conf.d/cryptroot.  Format:
113
116
# target=sda2_crypt,source=/dev/sda2,key=none,keyscript=/foo/bar/baz
149
152
else
150
153
    rm /conf/conf.d/cryptroot.mandos
151
154
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