/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-19 16:04:11 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080919160411-9xeasm77gx5xpfqo
* Makefile (install-server): Only do update-rc.d if $(DESTDIR) is
                             empty.

* debian/control (Source: mandos): Do not depend on "docbook";
                                   "docbook-xsl" is enough.

Show diffs side-by-side

added added

removed removed

Lines of Context:
51
51
    exit 1
52
52
fi
53
53
 
54
 
set `{ getent passwd _mandos \
55
 
    || getent passwd nobody \
56
 
    || echo ::65534:65534:::; } \
57
 
    | cut --delimiter=: --fields=3,4 --only-delimited \
58
 
    --output-delimiter=" "`
59
 
mandos_user="$1"
60
 
mandos_group="$2"
 
54
mandos_user="`{ getent passwd mandos \
 
55
                || getent passwd nobody \
 
56
                || echo ::65534::::; } \
 
57
        | awk --field-separator=: '{ print $3 }'`" 
 
58
mandos_group="`{ getent group mandos \
 
59
                || getent group nogroup \
 
60
                || echo ::65534:; } \
 
61
        | awk --field-separator=: '{ print $3 }'`"
61
62
 
62
63
# The Mandos network client uses the network
63
64
auto_add_modules net
88
89
        continue
89
90
    fi
90
91
    case "$base" in
91
 
        *~|.*|\#*\#|*.dpkg-old|*.dpkg-bak|*.dpkg-new|*.dpkg-divert)
92
 
            : ;;
93
 
        */"*")
94
 
            echo "W: Mandos client plugin directory is empty." >&2 ;;
95
 
        *) copy_exec "$file" "${PLUGINDIR}" ;;
 
92
        *~|.*|\#*\#|*.dpkg-old|*.dpkg-new|*.dpkg-divert) : ;;
 
93
        "*") :;;
 
94
        *) copy_exec "$file" "${PLUGINDIR}";;
96
95
    esac
97
96
done
98
97
 
100
99
for file in /etc/mandos/plugins.d/*; do
101
100
    base="`basename \"$file\"`"
102
101
    case "$base" in
103
 
        *~|.*|\#*\#|*.dpkg-old|*.dpkg-bak|*.dpkg-new|*.dpkg-divert)
104
 
            : ;;
105
 
        */"*") : ;;
106
 
        *) copy_exec "$file" "${PLUGINDIR}" ;;
 
102
        *~|.*|\#*\#|*.dpkg-old|*.dpkg-new|*.dpkg-divert) : ;;
 
103
        "*") :;;
 
104
        *) copy_exec "$file" "${PLUGINDIR}";;
107
105
    esac
108
106
done
109
107
 
123
121
done
124
122
 
125
123
if [ ${mandos_user} != 65534 ]; then
126
 
    sed --in-place --expression="1i--userid=${mandos_user}" \
127
 
        "${DESTDIR}${CONFDIR}/plugin-runner.conf"
 
124
    PLUGINRUNNERCONF="${DESTDIR}${CONFDIR}/plugin-runner.conf"
 
125
    echo "--userid=${mandos_user}" >> "$PLUGINRUNNERCONF"
128
126
fi
129
127
 
130
128
if [ ${mandos_group} != 65534 ]; then
131
 
    sed --in-place --expression="1i--groupid=${mandos_group}" \
132
 
        "${DESTDIR}${CONFDIR}/plugin-runner.conf"
 
129
    PLUGINRUNNERCONF="${DESTDIR}${CONFDIR}/plugin-runner.conf"
 
130
    echo "--groupid=${mandos_group}" >> "$PLUGINRUNNERCONF"
133
131
fi
134
132
 
135
133
# Key files 
136
 
for file in "$keydir"/*; do
 
134
for file in  "$keydir"/*; do
137
135
    if [ -d "$file" ]; then
138
136
        continue
139
137
    fi
168
166
        chmod a+rX "${DESTDIR}$dir"
169
167
    fi
170
168
done
171
 
for dir in "${DESTDIR}"/lib* "${DESTDIR}"/usr/lib*; do
172
 
    if [ -d "$dir" ]; then
173
 
        find "$dir" \! -perm -u+rw,g+r -prune -or -print0 \
174
 
            | xargs --null --no-run-if-empty chmod a+rX
175
 
    fi
 
169
for dir in /lib /usr/lib; do
 
170
    find "${DESTDIR}$dir" \! -perm -u+rw,g+r -prune -or -print0 \
 
171
        | xargs --null --no-run-if-empty chmod a+rX
176
172
done