/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 00:00:51 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080919000051-tgm5erxuj0zhs867
* debian/mandos-client.README.Debian: Document "eth0" default and how
                                      to change it.

* debian/mandos-client.postrm (update_initramfs): Use "type" instead
                                                  of "which".

* plugin-runner.c (handle_sigchld, print_out_password): Declared
                                                        static.

* plugin-runner.xml (SYNOPSIS, OPTIONS): Changed "VAR" to "ENV" in the
                                         "--global-env" option to be
                                         consistent with the
                                         "--env-for" option.

Show diffs side-by-side

added added

removed removed

Lines of Context:
initramfs-tools-hook
51
51
    exit 1
52
52
fi
53
53
 
54
 
mandos_user="`{ getent passwd _mandos \
55
 
                || getent passwd mandos \
 
54
mandos_user="`{ getent passwd mandos \
56
55
                || getent passwd nobody \
57
56
                || echo ::65534::::; } \
58
57
        | awk --field-separator=: '{ print $3 }'`" 
59
 
mandos_group="`{ getent group _mandos \
60
 
                || getent group mandos \
 
58
mandos_group="`{ getent group mandos \
61
59
                || getent group nogroup \
62
60
                || echo ::65534:; } \
63
61
        | awk --field-separator=: '{ print $3 }'`"
91
89
        continue
92
90
    fi
93
91
    case "$base" in
94
 
        *~|.*|\#*\#|*.dpkg-old|*.dpkg-bak|*.dpkg-new|*.dpkg-divert) : ;;
 
92
        *~|.*|\#*\#|*.dpkg-old|*.dpkg-new|*.dpkg-divert) : ;;
95
93
        "*") :;;
96
94
        *) copy_exec "$file" "${PLUGINDIR}";;
97
95
    esac
101
99
for file in /etc/mandos/plugins.d/*; do
102
100
    base="`basename \"$file\"`"
103
101
    case "$base" in
104
 
        *~|.*|\#*\#|*.dpkg-old|*.dpkg-bak|*.dpkg-new|*.dpkg-divert) : ;;
 
102
        *~|.*|\#*\#|*.dpkg-old|*.dpkg-new|*.dpkg-divert) : ;;
105
103
        "*") :;;
106
104
        *) copy_exec "$file" "${PLUGINDIR}";;
107
105
    esac
122
120
    cp --archive --sparse=always "$file" "${DESTDIR}${CONFDIR}"
123
121
done
124
122
 
125
 
if [ ${mandos_user} != 65534 ]; then
126
 
    PLUGINRUNNERCONF="${DESTDIR}${CONFDIR}/plugin-runner.conf"
127
 
    cat <<-EOF >> "$PLUGINRUNNERCONF"
128
 
        
129
 
        --userid=${mandos_user}
130
 
EOF
131
 
fi
132
 
 
133
 
if [ ${mandos_group} != 65534 ]; then
134
 
    PLUGINRUNNERCONF="${DESTDIR}${CONFDIR}/plugin-runner.conf"
135
 
    cat <<-EOF >> "$PLUGINRUNNERCONF"
136
 
        
137
 
        --groupid=${mandos_group}
138
 
EOF
139
 
fi
140
 
 
141
123
# Key files 
142
124
for file in  "$keydir"/*; do
143
125
    if [ -d "$file" ]; then
174
156
        chmod a+rX "${DESTDIR}$dir"
175
157
    fi
176
158
done
177
 
for dir in "${DESTDIR}"/lib* "${DESTDIR}"/usr/lib*; do
178
 
    if [ -d "$dir" ]; then
179
 
        find "$dir" \! -perm -u+rw,g+r -prune -or -print0 \
180
 
            | xargs --null --no-run-if-empty chmod a+rX
181
 
    fi
 
159
for dir in /lib /usr/lib; do
 
160
    find "${DESTDIR}$dir" \! -perm -u+rw,g+r -prune -or -print0 \
 
161
        | xargs --null --no-run-if-empty chmod a+rX
182
162
done