/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: 2011-10-14 18:36:15 UTC
  • mfrom: (505.1.17 teddy)
  • Revision ID: teddy@recompile.se-20111014183615-xjmowtkz3ete2smd
Merge from Teddy:

Bug fixes: Make D-Bus properties settable again, and handle checkers
for disabled clients correctly.

* mandos (ClientDBus.notifychangeproperty/setter): Bug fix: pass
                                                   variant_level as a
                                                   keyword argument.
  (ClientDBus.Timeout_dbus_property): Bug fix: call function
                                      _timedelta_to_milliseconds in
                                      its new position as a global
                                      function.
  (Client.checked_ok): Bug fix: Handle disabled client.
* mandos-ctl (main): Bug fix: Handle empty strings correctly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
initramfs-tools-hook
114
114
fi
115
115
 
116
116
# Config files
117
 
for file in /etc/mandos/*; do
 
117
for file in /etc/mandos/plugin-runner.conf; do
118
118
    if [ -d "$file" ]; then
119
119
        continue
120
120
    fi
131
131
        "${DESTDIR}${CONFDIR}/plugin-runner.conf"
132
132
fi
133
133
 
134
 
# Key files 
 
134
# Key files
135
135
for file in "$keydir"/*; do
136
136
    if [ -d "$file" ]; then
137
137
        continue