/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

  • Committer: Teddy Hogeborn
  • Date: 2011-07-16 00:29:19 UTC
  • Revision ID: teddy@fukt.bsnet.se-20110716002919-r77yikuiulj42o40
* initramfs-tools-script: Abort if plugin-runner is missing.  Removed
                          workaround for Debian bug #633582; the
                          workaround required getopt, which can not be
                          guaranteed.
* plugin-runner.c (main): Work around Debian bug #633582.
* plugins.d/mandos-client.c (main): - '' -

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"
72
71
 
73
72
# Make directories
74
73
install --directory --mode=u=rwx,go=rx "${DESTDIR}${CONFDIR}" \
107
106
    esac
108
107
done
109
108
 
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
 
 
128
109
# GPGME needs /usr/bin/gpg
129
110
if [ ! -e "${DESTDIR}/usr/bin/gpg" \
130
111
    -a -n "`ls \"${DESTDIR}\"/usr/lib/libgpgme.so* \
150
131
        "${DESTDIR}${CONFDIR}/plugin-runner.conf"
151
132
fi
152
133
 
153
 
# Key files
 
134
# Key files 
154
135
for file in "$keydir"/*; do
155
136
    if [ -d "$file" ]; then
156
137
        continue