/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: 2010-09-12 02:51:19 UTC
  • Revision ID: teddy@fukt.bsnet.se-20100912025119-7vvpqofpnbxf7i22
Rename all D-Bus properties to conform to D-Bus naming conventions;
all programs changed.

Also rename client setting "approved_delay" to "approval_delay", and
"approved_duration" to "approval_duration"; all programs changed.

* mandos (ClientDBus.NeedApproval): Bug fix: send an UInt64, not a
                                    float.
  (ClientDBus.ApprovedByDefault_dbus_property,
  ClientDBus.ApprovalDelay_dbus_property,
  ClientDBus.ApprovalDuration_dbus_property): Bug fix: send
                                              PropertyChanged signal.

Show diffs side-by-side

added added

removed removed

Lines of Context:
initramfs-tools-hook
68
68
CONFDIR="/conf/conf.d/mandos"
69
69
MANDOSDIR="/lib/mandos"
70
70
PLUGINDIR="${MANDOSDIR}/plugins.d"
71
 
HOOKDIR="${MANDOSDIR}/network-hooks.d"
72
71
 
73
72
# Make directories
74
73
install --directory --mode=u=rwx,go=rx "${DESTDIR}${CONFDIR}" \
75
 
        "${DESTDIR}${MANDOSDIR}" "${DESTDIR}${HOOKDIR}"
 
74
        "${DESTDIR}${MANDOSDIR}"
76
75
install --owner=${mandos_user} --group=${mandos_group} --directory \
77
76
    --mode=u=rwx "${DESTDIR}${PLUGINDIR}"
78
77
 
107
106
    esac
108
107
done
109
108
 
110
 
# Copy network hooks
111
 
for hook in /etc/mandos/network-hooks.d/*; do
112
 
    case "`basename \"$hook\"`" in
113
 
        "*") continue ;;
114
 
        *[!A-Za-z0-9_.-]*) continue ;;
115
 
        *) test -d "$hook" || copy_exec "$hook" "${HOOKDIR}" ;;
116
 
    esac
117
 
    if [ -x "$hook" ]; then
118
 
        # Copy any files needed by the network hook
119
 
        MANDOSNETHOOKDIR=/etc/mandos/network-hooks.d MODE=files \
120
 
            VERBOSITY=0 "$hook" files | while read file target; do
121
 
            if [ -z "${target}" ]; then
122
 
                copy_exec "$file"
123
 
            else
124
 
                copy_exec "$file" "$target"
125
 
            fi
126
 
        done
127
 
        # Copy and load any modules needed by the network hook
128
 
        MANDOSNETHOOKDIR=/etc/mandos/network-hooks.d MODE=modules \
129
 
            VERBOSITY=0 "$hook" modules | while read module; do
130
 
            if [ -z "${target}" ]; then
131
 
                force_load "$module"
132
 
            fi
133
 
        done
134
 
    fi
135
 
done
136
 
 
137
109
# GPGME needs /usr/bin/gpg
138
110
if [ ! -e "${DESTDIR}/usr/bin/gpg" \
139
111
    -a -n "`ls \"${DESTDIR}\"/usr/lib/libgpgme.so* \
159
131
        "${DESTDIR}${CONFDIR}/plugin-runner.conf"
160
132
fi
161
133
 
162
 
# Key files
 
134
# Key files 
163
135
for file in "$keydir"/*; do
164
136
    if [ -d "$file" ]; then
165
137
        continue