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

* network-hooks.d/bridge: Bug fix - really find brctl.

Show diffs side-by-side

added added

removed removed

Lines of Context:
initramfs-tools-hook
68
68
CONFDIR="/conf/conf.d/mandos"
69
69
MANDOSDIR="/lib/mandos"
70
70
PLUGINDIR="${MANDOSDIR}/plugins.d"
 
71
HOOKDIR="${MANDOSDIR}/network-hooks.d"
71
72
 
72
73
# Make directories
73
74
install --directory --mode=u=rwx,go=rx "${DESTDIR}${CONFDIR}" \
74
 
        "${DESTDIR}${MANDOSDIR}"
 
75
        "${DESTDIR}${MANDOSDIR}" "${DESTDIR}${HOOKDIR}"
75
76
install --owner=${mandos_user} --group=${mandos_group} --directory \
76
77
    --mode=u=rwx "${DESTDIR}${PLUGINDIR}"
77
78
 
106
107
    esac
107
108
done
108
109
 
 
110
# Copy network hooks
 
111
for hook in /etc/mandos/network-hooks.d/*; do
 
112
    case "`basename \"$hook\"`" in
 
113
        "*") continue ;;
 
114
        *[!A-Za-z0-9_.-]*) continue ;;
 
115
        *) test -d "$hook" || copy_exec "$hook" "${HOOKDIR}" ;;
 
116
    esac
 
117
    if [ -x "$hook" ]; then
 
118
        # Copy any files needed by the network hook
 
119
        MANDOSNETHOOKDIR=/etc/mandos/network-hooks.d MODE=files \
 
120
            VERBOSITY=0 "$hook" files | while read file target; do
 
121
            if [ ! -e "${file}" ]; then
 
122
                echo "WARNING: file ${file} not found, requested by Mandos network hook '${hook##*/}'" >&2
 
123
            fi
 
124
            if [ -z "${target}" ]; then
 
125
                copy_exec "$file"
 
126
            else
 
127
                copy_exec "$file" "$target"
 
128
            fi
 
129
        done
 
130
        # Copy and load any modules needed by the network hook
 
131
        MANDOSNETHOOKDIR=/etc/mandos/network-hooks.d MODE=modules \
 
132
            VERBOSITY=0 "$hook" modules | while read module; do
 
133
            if [ -z "${target}" ]; then
 
134
                force_load "$module"
 
135
            fi
 
136
        done
 
137
    fi
 
138
done
 
139
 
109
140
# GPGME needs /usr/bin/gpg
110
141
if [ ! -e "${DESTDIR}/usr/bin/gpg" \
111
142
    -a -n "`ls \"${DESTDIR}\"/usr/lib/libgpgme.so* \
131
162
        "${DESTDIR}${CONFDIR}/plugin-runner.conf"
132
163
fi
133
164
 
134
 
# Key files 
 
165
# Key files
135
166
for file in "$keydir"/*; do
136
167
    if [ -d "$file" ]; then
137
168
        continue