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

* Makefile (run-client): Add "--network-hook-dir" option.
* plugin-runner.c (main): Only try to work around Debian bug #633582
                          if started as root.
* plugins.d/mandos-client.c (run_network_hooks): Bug fix: Run all
                                                 network hooks, not
                                                 just the first one.
                                                 Also add debug output.
  (main): Only try to work around Debian bug #633582 or run network
          hooks as root if started as root.

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}" \
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
    # Copy any files needed by the network hook
 
118
    MANDOSNETHOOKDIR=/etc/mandos/network-hooks.d MODE=files \
 
119
        "$hook" files | while read file target; do
 
120
        if [ -z "${target}" ]; then
 
121
            copy_exec "$file"
 
122
        else
 
123
            copy_exec "$file" "$target"
 
124
        fi
 
125
    done
 
126
done
 
127
 
109
128
# GPGME needs /usr/bin/gpg
110
129
if [ ! -e "${DESTDIR}/usr/bin/gpg" \
111
130
    -a -n "`ls \"${DESTDIR}\"/usr/lib/libgpgme.so* \