/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: 2015-07-07 15:49:49 UTC
  • Revision ID: teddy@recompile.se-20150707154949-vbuj4pc6wf3o1vgz
mandos.service: Use Type=dbus (implicitly).

mandos.service ([Service]/Type): Removed.
               ([Service]/BusName): Uncommented; set to
                                    "se.recompile.Mandos".

Show diffs side-by-side

added added

removed removed

Lines of Context:
initramfs-tools-hook
219
219
    if [ -d "$file" ]; then
220
220
        continue
221
221
    fi
222
 
    case "$file" in
223
 
        *~|.*|\#*\#|*.dpkg-old|*.dpkg-bak|*.dpkg-new|*.dpkg-divert)
224
 
            : ;;
225
 
        "*") : ;;
226
 
        *)
227
 
            cp --archive --sparse=always "$file" \
228
 
               "${DESTDIR}${CONFDIR}"
229
 
            chown ${mandos_user}:${mandos_group} \
230
 
                  "${DESTDIR}${CONFDIR}/`basename \"$file\"`"
231
 
            ;;
232
 
    esac
 
222
    cp --archive --sparse=always "$file" "${DESTDIR}${CONFDIR}"
 
223
    chown ${mandos_user}:${mandos_group} \
 
224
        "${DESTDIR}${CONFDIR}/`basename \"$file\"`"
233
225
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
240
226
 
241
227
# /lib/mandos/plugin-runner will drop priviliges, but needs access to
242
228
# its plugin directory and its config file.  However, since almost all
266
252
done
267
253
for dir in "${DESTDIR}"/lib* "${DESTDIR}"/usr/lib*; do
268
254
    if [ -d "$dir" ]; then
269
 
        find "$dir" \! -perm -u+rw,g+r -prune -or \! -type l -print0 \
270
 
            | xargs --null --no-run-if-empty chmod a+rX --
 
255
        find "$dir" \! -perm -u+rw,g+r -prune -or -print0 \
 
256
            | xargs --null --no-run-if-empty chmod a+rX
271
257
    fi
272
258
done