/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-11-26 23:08:17 UTC
  • mto: (518.1.8 mandos-persistent)
  • mto: This revision was merged to the branch mainline in revision 524.
  • Revision ID: teddy@recompile.se-20111126230817-tv08v831s2yltbkd
Make "enabled" a client config option.

* DBUS-API: Fix wording on "Expires" option.
* clients.conf (enabled): New.
* mandos (Client): "last_enabled" can now be None.
  (Client.__init__): Get "enabled" from config.  Only set
                     "last_enabled" and "expires" if enabled.
  (ClientDBus.Created_dbus_property): Removed redundant dbus.String().
  (ClientDBus.Interval_dbus_property): If changed, only reschedule
                                       checker if enabled.
  (main/special_settings): Added "enabled".
* mandos-clients.conf (OPTIONS): Added "enabled".

Show diffs side-by-side

added added

removed removed

Lines of Context:
initramfs-tools-hook
90
90
    case "$base" in
91
91
        *~|.*|\#*\#|*.dpkg-old|*.dpkg-bak|*.dpkg-new|*.dpkg-divert)
92
92
            : ;;
93
 
        */"*")
94
 
            echo "W: Mandos client plugin directory is empty." >&2 ;;
 
93
        "*") echo "W: Mandos client plugin directory is empty." >&2 ;;
95
94
        *) copy_exec "$file" "${PLUGINDIR}" ;;
96
95
    esac
97
96
done
102
101
    case "$base" in
103
102
        *~|.*|\#*\#|*.dpkg-old|*.dpkg-bak|*.dpkg-new|*.dpkg-divert)
104
103
            : ;;
105
 
        */"*") : ;;
 
104
        "*") : ;;
106
105
        *) copy_exec "$file" "${PLUGINDIR}" ;;
107
106
    esac
108
107
done
115
114
fi
116
115
 
117
116
# Config files
118
 
for file in /etc/mandos/*; do
 
117
for file in /etc/mandos/plugin-runner.conf; do
119
118
    if [ -d "$file" ]; then
120
119
        continue
121
120
    fi
123
122
done
124
123
 
125
124
if [ ${mandos_user} != 65534 ]; then
126
 
    PLUGINRUNNERCONF="${DESTDIR}${CONFDIR}/plugin-runner.conf"
127
 
    cat <<-EOF >> "$PLUGINRUNNERCONF"
128
 
        
129
 
        --userid=${mandos_user}
130
 
EOF
 
125
    sed --in-place --expression="1i--userid=${mandos_user}" \
 
126
        "${DESTDIR}${CONFDIR}/plugin-runner.conf"
131
127
fi
132
128
 
133
129
if [ ${mandos_group} != 65534 ]; then
134
 
    PLUGINRUNNERCONF="${DESTDIR}${CONFDIR}/plugin-runner.conf"
135
 
    cat <<-EOF >> "$PLUGINRUNNERCONF"
136
 
        
137
 
        --groupid=${mandos_group}
138
 
EOF
 
130
    sed --in-place --expression="1i--groupid=${mandos_group}" \
 
131
        "${DESTDIR}${CONFDIR}/plugin-runner.conf"
139
132
fi
140
133
 
141
 
# Key files 
 
134
# Key files
142
135
for file in "$keydir"/*; do
143
136
    if [ -d "$file" ]; then
144
137
        continue