/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: 2012-06-16 23:25:46 UTC
  • Revision ID: teddy@recompile.se-20120616232546-dcrkmnhd4yhq6mvd
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
                                            All users changed.
  (add_server): Take new "current_server" argument; all callers
                changed.
  (init_gpgme, pgp_packet_decrypt, init_gnutls_global,
  init_gnutls_session, start_mandos_communication,
  avahi_loop_with_timeout): Take new "mc" argument"; all callers
                            changed.
  (resolve_callback, browse_callback): Handle void pointer userdata as
                                       "mc", a pointer to
                                       mandos_context.  All callers
                                       changed.
  (main): New "mc" variable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
initramfs-tools-hook
51
51
    exit 1
52
52
fi
53
53
 
54
 
mandos_user="`{ getent passwd mandos \
55
 
                || getent passwd nobody \
56
 
                || echo ::65534::::; } \
57
 
        | awk --field-separator=: '{ print $3 }'`" 
58
 
mandos_group="`{ getent group mandos \
59
 
                || getent group nogroup \
60
 
                || echo ::65534:; } \
61
 
        | awk --field-separator=: '{ print $3 }'`"
 
54
set `{ getent passwd _mandos \
 
55
    || getent passwd nobody \
 
56
    || echo ::65534:65534:::; } \
 
57
    | cut --delimiter=: --fields=3,4 --only-delimited \
 
58
    --output-delimiter=" "`
 
59
mandos_user="$1"
 
60
mandos_group="$2"
62
61
 
63
62
# The Mandos network client uses the network
64
63
auto_add_modules net
69
68
CONFDIR="/conf/conf.d/mandos"
70
69
MANDOSDIR="/lib/mandos"
71
70
PLUGINDIR="${MANDOSDIR}/plugins.d"
 
71
HOOKDIR="${MANDOSDIR}/network-hooks.d"
72
72
 
73
73
# Make directories
74
74
install --directory --mode=u=rwx,go=rx "${DESTDIR}${CONFDIR}" \
75
 
        "${DESTDIR}${MANDOSDIR}"
 
75
        "${DESTDIR}${MANDOSDIR}" "${DESTDIR}${HOOKDIR}"
76
76
install --owner=${mandos_user} --group=${mandos_group} --directory \
77
77
    --mode=u=rwx "${DESTDIR}${PLUGINDIR}"
78
78
 
89
89
        continue
90
90
    fi
91
91
    case "$base" in
92
 
        *~|.*|\#*\#|*.dpkg-old|*.dpkg-new|*.dpkg-divert) : ;;
93
 
        "*") :;;
94
 
        *) copy_exec "$file" "${PLUGINDIR}";;
 
92
        *~|.*|\#*\#|*.dpkg-old|*.dpkg-bak|*.dpkg-new|*.dpkg-divert)
 
93
            : ;;
 
94
        "*") echo "W: Mandos client plugin directory is empty." >&2 ;;
 
95
        *) copy_exec "$file" "${PLUGINDIR}" ;;
95
96
    esac
96
97
done
97
98
 
99
100
for file in /etc/mandos/plugins.d/*; do
100
101
    base="`basename \"$file\"`"
101
102
    case "$base" in
102
 
        *~|.*|\#*\#|*.dpkg-old|*.dpkg-new|*.dpkg-divert) : ;;
103
 
        "*") :;;
104
 
        *) copy_exec "$file" "${PLUGINDIR}";;
105
 
    esac
 
103
        *~|.*|\#*\#|*.dpkg-old|*.dpkg-bak|*.dpkg-new|*.dpkg-divert)
 
104
            : ;;
 
105
        "*") : ;;
 
106
        *) copy_exec "$file" "${PLUGINDIR}" ;;
 
107
    esac
 
108
done
 
109
 
 
110
# Get DEVICE from initramfs.conf and other files
 
111
. /etc/initramfs-tools/initramfs.conf
 
112
for conf in /etc/initramfs-tools/conf.d/*; do
 
113
    if [ -n `basename \"$conf\" | grep '^[[:alnum:]][[:alnum:]\._-]*$' \
 
114
        | grep -v '\.dpkg-.*$'` ]; then
 
115
        [ -f ${conf} ] && . ${conf}
 
116
    fi
 
117
done
 
118
export DEVICE
 
119
 
 
120
# Copy network hooks
 
121
for hook in /etc/mandos/network-hooks.d/*; do
 
122
    case "`basename \"$hook\"`" in
 
123
        "*") continue ;;
 
124
        *[!A-Za-z0-9_.-]*) continue ;;
 
125
        *) test -d "$hook" || copy_exec "$hook" "${HOOKDIR}" ;;
 
126
    esac
 
127
    if [ -x "$hook" ]; then
 
128
        # Copy any files needed by the network hook
 
129
        MANDOSNETHOOKDIR=/etc/mandos/network-hooks.d MODE=files \
 
130
            VERBOSITY=0 "$hook" files | while read file target; do
 
131
            if [ ! -e "${file}" ]; then
 
132
                echo "WARNING: file ${file} not found, requested by Mandos network hook '${hook##*/}'" >&2
 
133
            fi
 
134
            if [ -z "${target}" ]; then
 
135
                copy_exec "$file"
 
136
            else
 
137
                copy_exec "$file" "$target"
 
138
            fi
 
139
        done
 
140
        # Copy and load any modules needed by the network hook
 
141
        MANDOSNETHOOKDIR=/etc/mandos/network-hooks.d MODE=modules \
 
142
            VERBOSITY=0 "$hook" modules | while read module; do
 
143
            if [ -z "${target}" ]; then
 
144
                force_load "$module"
 
145
            fi
 
146
        done
 
147
    fi
106
148
done
107
149
 
108
150
# GPGME needs /usr/bin/gpg
113
155
fi
114
156
 
115
157
# Config files
116
 
for file in /etc/mandos/*; do
 
158
for file in /etc/mandos/plugin-runner.conf; do
117
159
    if [ -d "$file" ]; then
118
160
        continue
119
161
    fi
121
163
done
122
164
 
123
165
if [ ${mandos_user} != 65534 ]; then
124
 
    PLUGINRUNNERCONF="${DESTDIR}${CONFDIR}/plugin-runner.conf"
125
 
    echo "--userid=${mandos_user}" >> "$PLUGINRUNNERCONF"
 
166
    sed --in-place --expression="1i--userid=${mandos_user}" \
 
167
        "${DESTDIR}${CONFDIR}/plugin-runner.conf"
126
168
fi
127
169
 
128
170
if [ ${mandos_group} != 65534 ]; then
129
 
    PLUGINRUNNERCONF="${DESTDIR}${CONFDIR}/plugin-runner.conf"
130
 
    echo "--groupid=${mandos_group}" >> "$PLUGINRUNNERCONF"
 
171
    sed --in-place --expression="1i--groupid=${mandos_group}" \
 
172
        "${DESTDIR}${CONFDIR}/plugin-runner.conf"
131
173
fi
132
174
 
133
 
# Key files 
134
 
for file in  "$keydir"/*; do
 
175
# Key files
 
176
for file in "$keydir"/*; do
135
177
    if [ -d "$file" ]; then
136
178
        continue
137
179
    fi
166
208
        chmod a+rX "${DESTDIR}$dir"
167
209
    fi
168
210
done
169
 
for dir in /lib /usr/lib; do
170
 
    find "${DESTDIR}$dir" \! -perm -u+rw,g+r -prune -or -print0 \
171
 
        | xargs --null --no-run-if-empty chmod a+rX
 
211
for dir in "${DESTDIR}"/lib* "${DESTDIR}"/usr/lib*; do
 
212
    if [ -d "$dir" ]; then
 
213
        find "$dir" \! -perm -u+rw,g+r -prune -or -print0 \
 
214
            | xargs --null --no-run-if-empty chmod a+rX
 
215
    fi
172
216
done