/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: 2008-09-01 16:53:17 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080901165317-77dccp81zyqimt2j
* plugin-runner.c (add_environment): Override existing environment
                                     variables when asked to do so.
                                     All callers changed.
  (main): Removed old argp.args_doc string.  Parse argument file
          before normal command line arguments.  Use ARGP_IN_ORDER
          flag in both calls to argp_parse.  Do not strdup() strings
          to be sent to add_environment().

* plugin-runner.xml (OPTIONS): Document "--global-env" and "--envs-for".
  (FILES): Note that the config file is parsed before the command line
           options.

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 \
97
 
    --no-default-keyring --no-options \
 
96
gpg --no-random-seed-file --quiet --batch --no-tty --armor \
 
97
    --no-default-keyring --no-options --enable-dsa2 \
98
98
    --homedir "${DESTDIR}${CONFDIR}" --no-permission-warning \
99
 
    --import-options import-minimal \
 
99
    --trust-model always --import-options import-minimal \
100
100
    --import "${DESTDIR}${CONFDIR}/seckey.txt"
101
101
chown nobody "${DESTDIR}${CONFDIR}/secring.gpg"
102
102