/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: 2010-10-07 18:42:26 UTC
  • mto: (237.4.29 release)
  • mto: This revision was merged to the branch mainline in revision 457.
  • Revision ID: teddy@fukt.bsnet.se-20101007184226-yl55rd8g1t64t9nj
Tags: version-1.2.2-1
* Makefile (version): Changed to "1.2.2".
* NEWS (Version 1.2.2): New entry.
* debian/changelog (1.2.2-1): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
initramfs-tools-script
57
57
# Get DEVICE from /conf/initramfs.conf and other files
58
58
. /conf/initramfs.conf
59
59
for conf in /conf/conf.d/*; do
60
 
    [ -f "${conf}" ] && . "${conf}"
 
60
    [ -f ${conf} ] && . ${conf}
61
61
done
62
62
if [ -e /conf/param.conf ]; then
63
63
    . /conf/param.conf
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
98
97
    configure_networking
99
 
    set -e
100
98
    if [ -n "$connect" ]; then
101
99
        cat <<-EOF >>/conf/conf.d/mandos/plugin-runner.conf
102
100
        
110
108
 
111
109
# Our keyscript
112
110
mandos=/lib/mandos/plugin-runner
113
 
test -x "$mandos"
114
111
 
115
112
# parse /conf/conf.d/cryptroot.  Format:
116
113
# target=sda2_crypt,source=/dev/sda2,key=none,keyscript=/foo/bar/baz
117
114
exec 3>/conf/conf.d/cryptroot.mandos
118
 
while read -r options; do
 
115
while read options; do
119
116
    newopts=""
120
117
    # Split option line on commas
121
118
    old_ifs="$IFS"