/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-conf

  • Committer: Teddy Hogeborn
  • Date: 2013-10-28 08:38:47 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 307.
  • Revision ID: teddy@recompile.se-20131028083847-cper3srg5o29r2ge
Use architecture libdir.

Instead of always using /usr/lib/mandos, use whatever the architecture
specifies, like /usr/lib/x86_64-linux-gnu/mandos or /usr/lib64/mandos.
Still use /usr/lib/mandos as a fallback.

* Makefile (LIBDIR): New.
 (install-client-nokey, uninstall-client): Use LIBDIR instead of
                                           $(PREFIX)/lib.
* initramfs-tools-hook: Detect correct libdir and copy from there.

Reported-by: Nathanael D. Noblet <nathanael@gnat.ca>
Suggested-by: Nathanael D. Noblet <nathanael@gnat.ca>

Show diffs side-by-side

added added

removed removed

Lines of Context:
initramfs-tools-hook-conf
 
1
# -*- shell-script -*-
 
2
 
 
3
# if mkinitramfs is started by mkinitramfs-kpkg, mkinitramfs-kpkg has
 
4
# already touched the initrd file with umask 022 before we had a
 
5
# chance to affect it.  We cannot allow a readable initrd file,
 
6
# therefore we must fix this now.
 
7
if [ -e "${outfile}" ] \
 
8
    && [ `stat --format=%s "${outfile}"` -eq 0 ]; then
 
9
    rm "${outfile}"
 
10
    (umask 027; touch "${outfile}")
 
11
fi
 
12
 
 
13
UMASK=027