/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

  • Committer: Teddy Hogeborn
  • Date: 2009-05-17 00:50:09 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090517005009-c0iptxampo6nf177
* initramfs-tools-hook-conf: Security bug fix: Add code to handle
                             being called by "mkinitramfs-kpkg"
                             instead of "update-initramfs".

Show diffs side-by-side

added added

removed removed

Lines of Context:
initramfs-tools-script
24
24
        ;;
25
25
esac
26
26
 
 
27
. /scripts/functions
 
28
 
27
29
for param in `cat /proc/cmdline`; do
28
30
    case "$param" in
29
 
        mandos=off) exit 0;;
 
31
        ip=*) IPOPTS="${param#ip=}" ;;
 
32
        mandos=*)
 
33
            # Split option line on commas
 
34
            old_ifs="$IFS"
 
35
            IFS="$IFS,"
 
36
            for mpar in ${param#mandos=}; do
 
37
                IFS="$old_ifs"
 
38
                case "$mpar" in
 
39
                    off) exit 0 ;;
 
40
                    connect) connect="" ;;
 
41
                    connect:*) connect="${mpar#connect:}" ;;
 
42
                    *) log_warning_msg "$0: Bad option ${mpar}" ;;
 
43
                esac
 
44
            done
 
45
            unset mpar
 
46
            IFS="$old_ifs"
 
47
            unset old_ifs
 
48
            ;;
30
49
    esac
31
50
done
 
51
unset param
32
52
 
33
53
chmod a=rwxt /tmp
34
54
 
35
55
test -r /conf/conf.d/cryptroot
36
56
test -w /conf/conf.d
37
57
 
 
58
# Get DEVICE from /conf/initramfs.conf and other files
 
59
. /conf/initramfs.conf
 
60
for conf in /conf/conf.d/*; do
 
61
    [ -f ${conf} ] && . ${conf}
 
62
done
 
63
if [ -e /conf/param.conf ]; then
 
64
    . /conf/param.conf
 
65
fi
 
66
 
 
67
# Override DEVICE from sixth field of ip= kernel option, if passed
 
68
case "$IPOPTS" in
 
69
    *:*:*:*:*:*)                # At least six fields
 
70
        # Remove the first five fields
 
71
        device="${IPOPTS#*:*:*:*:*:}"
 
72
        # Remove all fields except the first one
 
73
        DEVICE="${device%%:*}"
 
74
        ;;
 
75
esac
 
76
 
 
77
# Add device setting (if any) to plugin-runner.conf
 
78
if [ "${DEVICE+set}" = set ]; then
 
79
    # Did we get the device from an ip= option?
 
80
    if [ "${device+set}" = set ]; then
 
81
        # Let ip= option override local config; append:
 
82
        cat <<-EOF >>/conf/conf.d/mandos/plugin-runner.conf
 
83
        
 
84
        --options-for=mandos-client:--interface=${DEVICE}
 
85
EOF
 
86
    else
 
87
        # Prepend device setting so any later options would override:
 
88
        sed -i -e \
 
89
            '1i--options-for=mandos-client:--interface='"${DEVICE}" \
 
90
            /conf/conf.d/mandos/plugin-runner.conf
 
91
    fi
 
92
fi
 
93
unset device
 
94
 
 
95
# If we are connecting directly, run "configure_networking" (from
 
96
# /scripts/functions); it needs IPOPTS and DEVICE
 
97
if [ "${connect+set}" = set ]; then
 
98
    configure_networking
 
99
    if [ -n "$connect" ]; then
 
100
        cat <<-EOF >>/conf/conf.d/mandos/plugin-runner.conf
 
101
        
 
102
        --options-for=mandos-client:--connect=${connect}
 
103
EOF
 
104
    fi
 
105
fi
 
106
 
38
107
# Do not replace cryptroot file unless we need to.
39
108
replace_cryptroot=no
40
109