/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-09-07 01:20:43 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080907012043-w05a7qh6258eqh27
* Makefile: Clearly separate "local" install variable settings from
            "package" variable settings.
  (INITRAMFSTOOLS): New variable.
  (install-server): Use $(DESTDIR) to install init script and
                    /etc/default file.
  (install-client): Use $(INITRAMFSTOOLS).
  (uninstall-client): - '' -
  (purge-server): Use $(DESTDIR).

Show diffs side-by-side

added added

removed removed

Lines of Context:
initramfs-tools-hook
40
40
    exit 1
41
41
fi
42
42
 
43
 
for d in /etc/keys/mandos /etc/mandos/keys; do
 
43
for d in /etc/keys/mandos /usr/local/lib/mandos/keys; do
44
44
    if [ -d "$d" ]; then
45
45
        keydir="$d"
46
46
        break
120
120
    cp --archive --sparse=always "$file" "${DESTDIR}${CONFDIR}"
121
121
done
122
122
 
123
 
if [ ${mandos_user} != 65534 ]; then
124
 
    PLUGINRUNNERCONF="${DESTDIR}${CONFDIR}/plugin-runner.conf"
125
 
    echo "--userid=${mandos_user}" >> "$PLUGINRUNNERCONF"
126
 
fi
127
 
 
128
 
if [ ${mandos_group} != 65534 ]; then
129
 
    PLUGINRUNNERCONF="${DESTDIR}${CONFDIR}/plugin-runner.conf"
130
 
    echo "--groupid=${mandos_group}" >> "$PLUGINRUNNERCONF"
131
 
fi
132
 
 
133
123
# Key files 
134
124
for file in  "$keydir"/*; do
135
125
    if [ -d "$file" ]; then