/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: 2016-02-29 22:51:57 UTC
  • mfrom: (237.4.65 release)
  • Revision ID: teddy@recompile.se-20160229225157-if6c17o8ziwncvro
Merge from release branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
initramfs-tools-hook
231
231
            ;;
232
232
    esac
233
233
done
 
234
# Use Diffie-Hellman parameters file if available
 
235
if [ -e "${DESTDIR}${CONFDIR}"/dhparams.pem ]; then
 
236
    sed --in-place \
 
237
        --expression="1i--options-for=mandos-client:--dh-params=${CONFDIR}/dhparams.pem" \
 
238
        "${DESTDIR}/${CONFDIR}/plugin-runner.conf"
 
239
fi
234
240
 
235
241
# /lib/mandos/plugin-runner will drop priviliges, but needs access to
236
242
# its plugin directory and its config file.  However, since almost all
260
266
done
261
267
for dir in "${DESTDIR}"/lib* "${DESTDIR}"/usr/lib*; do
262
268
    if [ -d "$dir" ]; then
263
 
        find "$dir" \! -perm -u+rw,g+r -prune -or -print0 \
264
 
            | xargs --null --no-run-if-empty chmod a+rX
 
269
        find "$dir" \! -perm -u+rw,g+r -prune -or \! -type l -print0 \
 
270
            | xargs --null --no-run-if-empty chmod a+rX --
265
271
    fi
266
272
done