/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-05 20:19:02 UTC
  • mfrom: (416.1.2 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20100905201902-ivwsc01ecaaqlqg4
* mandos (AvahiService.entry_group_state_changed): Better debug log
                                                   message.
  (AvahiService.server_state_changed): Added debug log message.

* mandos-monitor (isoformat_to_datetime): New function.
  (MandosClientWidget): Show a countdown to disabling if last checker
                        failed.

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 [ ! -e "${file}" ]; then
122
 
                echo "WARNING: file ${file} not found, requested by Mandos network hook '${hook##*/}'" >&2
123
 
            fi
124
 
            if [ -z "${target}" ]; then
125
 
                copy_exec "$file"
126
 
            else
127
 
                copy_exec "$file" "$target"
128
 
            fi
129
 
        done
130
 
        # Copy and load any modules needed by the network hook
131
 
        MANDOSNETHOOKDIR=/etc/mandos/network-hooks.d MODE=modules \
132
 
            VERBOSITY=0 "$hook" modules | while read module; do
133
 
            if [ -z "${target}" ]; then
134
 
                force_load "$module"
135
 
            fi
136
 
        done
137
 
    fi
138
 
done
139
 
 
140
109
# GPGME needs /usr/bin/gpg
141
110
if [ ! -e "${DESTDIR}/usr/bin/gpg" \
142
111
    -a -n "`ls \"${DESTDIR}\"/usr/lib/libgpgme.so* \
162
131
        "${DESTDIR}${CONFDIR}/plugin-runner.conf"
163
132
fi
164
133
 
165
 
# Key files
 
134
# Key files 
166
135
for file in "$keydir"/*; do
167
136
    if [ -d "$file" ]; then
168
137
        continue