/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: 2024-11-03 16:01:18 UTC
  • mto: This revision was merged to the branch mainline in revision 412.
  • Revision ID: teddy@recompile.se-20241103160118-74csxmbgidxt9cx6
Make binary directory configurable

Reportedly, Arch Linux uses /bin for all binaries, not /sbin.
Therefore, make binary directory configurable.

From: Erich Eckner <mandos@eckner.net>
Signed-off-by: Teddy Hogeborn <teddy@recompile.se>

Show diffs side-by-side

added added

removed removed

Lines of Context:
initramfs-tools-hook
142
142
# Get DEVICE from initramfs.conf and other files
143
143
. /etc/initramfs-tools/initramfs.conf
144
144
for conf in /etc/initramfs-tools/conf.d/*; do
145
 
    if [ -n `basename \"$conf\" | grep '^[[:alnum:]][[:alnum:]\._-]*$' \
146
 
        | grep -v '\.dpkg-.*$'` ]; then
 
145
    if [ -n "`basename \"$conf\" \
 
146
        | grep '^[[:alnum:]][[:alnum:]\._-]*$' \
 
147
        | grep -v '\.dpkg-.*$'`" ]; then
147
148
        [ -f "${conf}" ] && . "${conf}"
148
149
    fi
149
150
done
179
180
 
180
181
# GPGME needs GnuPG
181
182
gpg=/usr/bin/gpg
182
 
libgpgme11_version="`dpkg-query --showformat='${Version}' --show libgpgme11`"
 
183
libgpgme11_version="`dpkg-query --showformat='${Version}\n' --show libgpgme11t64 libgpgme11 2>/dev/null | sed --quiet --expression='/./{p;q}'`"
183
184
if dpkg --compare-versions "$libgpgme11_version" ge 1.5.0-0.1; then
184
185
    if [ -e /usr/bin/gpgconf ]; then
185
186
        if [ ! -e "${DESTDIR}/usr/bin/gpgconf" ]; then