/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 plugins.d/usplash.xml

  • Committer: Teddy Hogeborn
  • Date: 2024-09-08 07:04:52 UTC
  • Revision ID: teddy@recompile.se-20240908070452-oyxj1zojswt0aft5
http://bugs.debian.org/1069689
Fix #1069689 by using pkg-config in debian/rules

The directory for systemd unit files (output of "pkg-config systemd
--variable=systemdsystemunitdir") has changed.  But there was a
hardcoded instance of this directory in debian/mandos.dirs.  Fix this
by removing the directory from debian/mandos.dirs, and instead
creating the correct directory explicitly in debian/rules.

* debian/mandos.dirs (lib/systemd/system): Removed.
* debian/rules (PKG_CONFIG): New; copied from Makefile.
  (override_dh_installdirs-indep): New; run dh_installdirs twice:
  first normally, and again for the systemd unit file directory.

Closes: #1069689
Reported-By: Helmut Grohne <helmut@subdivi.de>
Thanks: Helmut Grohne <helmut@subdivi.de> for report and analysis

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/usplash.xml
135
135
        <para>
136
136
          These variables will normally be inherited from
137
137
          <citerefentry><refentrytitle>plugin-runner</refentrytitle>
138
 
          <manvolnum>8mandos</manvolnum></citerefentry>, which will
139
 
          normally have inherited them from
140
 
          <filename>/scripts/local-top/cryptroot</filename> in the
141
 
          initial <acronym>RAM</acronym> disk environment, which will
142
 
          have set them from parsing kernel arguments and
143
 
          <filename>/conf/conf.d/cryptroot</filename> (also in the
144
 
          initial RAM disk environment), which in turn will have been
145
 
          created when the initial RAM disk image was created by
146
 
          <filename
147
 
          >/usr/share/initramfs-tools/hooks/cryptroot</filename>, by
148
 
          extracting the information of the root file system from
149
 
          <filename >/etc/crypttab</filename>.
 
138
          <manvolnum>8mandos</manvolnum></citerefentry>, which might
 
139
          have in turn inherited them from its calling process.
150
140
        </para>
151
141
        <para>
152
142
          This behavior is meant to exactly mirror the behavior of
290
280
    <para>
291
281
      <citerefentry><refentrytitle>intro</refentrytitle>
292
282
      <manvolnum>8mandos</manvolnum></citerefentry>,
293
 
      <citerefentry><refentrytitle>crypttab</refentrytitle>
294
 
      <manvolnum>5</manvolnum></citerefentry>,
295
283
      <citerefentry><refentrytitle>fifo</refentrytitle>
296
284
      <manvolnum>7</manvolnum></citerefentry>,
297
285
      <citerefentry><refentrytitle>plugin-runner</refentrytitle>