/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-14 21:03:26 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080814210326-u58d7rj78g3i0ed4
* plugins.d/password-request.c (init_gnutls_global): Renamed
                               "pubkeyfile" to "pubkeyfilename" and
                               "seckeyfile" to "seckeyfilename".
  (combinepath): Changed to use asprintf instead of malloc and memcpy.

  (main): Renamed "pubkeyfile" to "pubkeyname", renamed "seckeyfile"
          to "seckeyname" and created new non-const variables
          "pubkeyfilename" and "seckeyfilename".

* mandos (AvahiService.__init__): Bug fix: initialize
                                  "self.max_renames".
  (AvahiService.rename): Bug fix: use "self.name" instead of "name".

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