/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-06 00:19:53 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080906001953-5nk5uti6shzuyqdr
* plugins.d/password-prompt.c (main): If successful, output an extra
                                      newline to the console before
                                      exiting, to change to a new line
                                      away from the prompt.

* plugins.d/password-request.c (main): Bug fix: Moved calls to
                                       "init_gnutls_global()",
                                       "mkdtemp()", and "init_gpgme()"
                                       to *after* changing user &
                                       group.

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 /etc/mandos/keys; do
 
43
for d in /etc/keys/mandos /usr/local/lib/mandos/keys; do
44
44
    if [ -d "$d" ]; then
45
45
        keydir="$d"
46
46
        break
52
52
fi
53
53
 
54
54
mandos_user="`{ getent passwd mandos \
55
 
                || getent passwd nobody \
56
 
                || echo ::65534::::; } \
57
 
        | awk --field-separator=: '{ print $3 }'`" 
 
55
        || getent passwd nobody \
 
56
        || echo ::65534::::; } | awk -F: '{ print $3 }'`" 
58
57
mandos_group="`{ getent group mandos \
59
 
                || getent group nogroup \
60
 
                || echo ::65534:; } \
61
 
        | awk --field-separator=: '{ print $3 }'`"
 
58
        || getent group nogroup \
 
59
        || echo ::65534:; } | awk -F: '{ print $3 }'`"
62
60
 
63
61
# The Mandos network client uses the network
64
62
auto_add_modules net
106
104
done
107
105
 
108
106
# GPGME needs /usr/bin/gpg
109
 
if [ ! -e "${DESTDIR}/usr/bin/gpg" \
110
 
    -a -n "`ls \"${DESTDIR}\"/usr/lib/libgpgme.so* \
111
 
                2>/dev/null`" ]; then
 
107
if ! [ -e "${DESTDIR}/usr/bin/gpg" ] \
 
108
    && [ -n "`ls \"${DESTDIR}\"/usr/lib/libgpgme.so* 2>/dev/null`" ]; then
112
109
    copy_exec /usr/bin/gpg
113
110
fi
114
111
 
120
117
    cp --archive --sparse=always "$file" "${DESTDIR}${CONFDIR}"
121
118
done
122
119
 
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
 
 
133
120
# Key files 
134
121
for file in  "$keydir"/*; do
135
122
    if [ -d "$file" ]; then
167
154
    fi
168
155
done
169
156
for dir in /lib /usr/lib; do
170
 
    find "${DESTDIR}$dir" \! -perm -u+rw,g+r -prune -or -print0 \
 
157
    find "${DESTDIR}$dir" \! -perm -u+rw,g+r -prune -o -print0 \
171
158
        | xargs --null --no-run-if-empty chmod a+rX
172
159
done