/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

  • Committer: Teddy Hogeborn
  • Date: 2008-09-21 13:42:34 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080921134234-jo8p4rwtm50yb4xj
* clients.conf ([bar]/secfile): Do not imply armored format.

* debian/control: Build-Depend on pkg-config.

* debian/mandos.prerm (remove): Bug fix; check for
                                "/etc/init.d/mandos", not
                                "/etc/init.d/ssh".

Show diffs side-by-side

added added

removed removed

Lines of Context:
initramfs-tools-hook
40
40
    exit 1
41
41
fi
42
42
 
43
 
for d in /etc/keys/mandos /usr/local/lib/mandos/keys; do
 
43
for d in /etc/keys/mandos /etc/mandos/keys; do
44
44
    if [ -d "$d" ]; then
45
45
        keydir="$d"
46
46
        break
120
120
    cp --archive --sparse=always "$file" "${DESTDIR}${CONFDIR}"
121
121
done
122
122
 
 
123
if [ ${mandos_user} != 65534 ]; then
 
124
    PLUGINRUNNERCONF="${DESTDIR}${CONFDIR}/plugin-runner.conf"
 
125
    echo "--userid=${mandos_user}" >> "$PLUGINRUNNERCONF"
 
126
fi
 
127
 
 
128
if [ ${mandos_group} != 65534 ]; then
 
129
    PLUGINRUNNERCONF="${DESTDIR}${CONFDIR}/plugin-runner.conf"
 
130
    echo "--groupid=${mandos_group}" >> "$PLUGINRUNNERCONF"
 
131
fi
 
132
 
123
133
# Key files 
124
134
for file in  "$keydir"/*; do
125
135
    if [ -d "$file" ]; then