/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: 2008-08-19 13:25:14 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080819132514-wawrvgmfjovg9poj
* Makefile (DOCBOOKTOMAN): Added "--xinclude".

* mandos-options.xml: New file; moved mandos(8) option descriptions
                      here.

* mandos.conf.xml: Add XInclude namespace.
  (OPTIONS): New separate section with options from old "DESCRIPTION"
             section.  Changed all options to include a synopsis and
             include its paragraph from "mandos-options.xml".
  (FILES): Moved to before "EXAMPLES".
  (BUGS): New section.
  (EXAMPLES): Renamed to "EXAMPLE", as per man-pages(7).  Unindented
              example text.

* mandos.xml: Removed OVERVIEW entity.  Add XInclude namespace.
  (OPTIONS): Moved all descriptive paragraphs to "mandos-options.xml"
             and just <xi:include/> them from here.
  (OVERVIEW): Changed to do <xi:include/>.

* overview.xml: Added DOCTYPE; reportedly needed for XInclude to work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
93
93
    cp --archive --sparse=always "$file" "${DESTDIR}${CONFDIR}"
94
94
done
95
95
# Create key ring files
96
 
gpg --no-random-seed-file --quiet --batch --no-tty --armor \
97
 
    --no-default-keyring --no-options --enable-dsa2 \
 
96
gpg --no-random-seed-file --quiet --batch --no-tty \
 
97
    --no-default-keyring --no-options \
98
98
    --homedir "${DESTDIR}${CONFDIR}" --no-permission-warning \
99
 
    --trust-model always --import-options import-minimal \
 
99
    --import-options import-minimal \
100
100
    --import "${DESTDIR}${CONFDIR}/seckey.txt"
101
101
chown nobody "${DESTDIR}${CONFDIR}/secring.gpg"
102
102