/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to initramfs-tools-hook

  • Committer: teddy at bsnet
  • Date: 2011-02-11 19:02:24 UTC
  • mto: (237.7.13 mandos)
  • mto: This revision was merged to the branch mainline in revision 282.
  • Revision ID: teddy@fukt.bsnet.se-20110211190224-62celso7mswtep65
* mandos-monitor: Use unicode string literals.  Update __future__
                  import line to use all available and applicable
                  imports.

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 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 }'`"
 
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"
62
61
 
63
62
# The Mandos network client uses the network
64
63
auto_add_modules net
89
88
        continue
90
89
    fi
91
90
    case "$base" in
92
 
        *~|.*|\#*\#|*.dpkg-old|*.dpkg-bak|*.dpkg-new|*.dpkg-divert) : ;;
93
 
        "*") :;;
94
 
        *) copy_exec "$file" "${PLUGINDIR}";;
 
91
        *~|.*|\#*\#|*.dpkg-old|*.dpkg-bak|*.dpkg-new|*.dpkg-divert)
 
92
            : ;;
 
93
        "*") echo "W: Mandos client plugin directory is empty." >&2 ;;
 
94
        *) copy_exec "$file" "${PLUGINDIR}" ;;
95
95
    esac
96
96
done
97
97
 
99
99
for file in /etc/mandos/plugins.d/*; do
100
100
    base="`basename \"$file\"`"
101
101
    case "$base" in
102
 
        *~|.*|\#*\#|*.dpkg-old|*.dpkg-bak|*.dpkg-new|*.dpkg-divert) : ;;
103
 
        "*") :;;
104
 
        *) copy_exec "$file" "${PLUGINDIR}";;
 
102
        *~|.*|\#*\#|*.dpkg-old|*.dpkg-bak|*.dpkg-new|*.dpkg-divert)
 
103
            : ;;
 
104
        "*") : ;;
 
105
        *) copy_exec "$file" "${PLUGINDIR}" ;;
105
106
    esac
106
107
done
107
108
 
113
114
fi
114
115
 
115
116
# Config files
116
 
for file in /etc/mandos/*; do
 
117
for file in /etc/mandos/plugin-runner.conf; do
117
118
    if [ -d "$file" ]; then
118
119
        continue
119
120
    fi
121
122
done
122
123
 
123
124
if [ ${mandos_user} != 65534 ]; then
124
 
    PLUGINRUNNERCONF="${DESTDIR}${CONFDIR}/plugin-runner.conf"
125
 
    echo "--userid=${mandos_user}" >> "$PLUGINRUNNERCONF"
 
125
    sed --in-place --expression="1i--userid=${mandos_user}" \
 
126
        "${DESTDIR}${CONFDIR}/plugin-runner.conf"
126
127
fi
127
128
 
128
129
if [ ${mandos_group} != 65534 ]; then
129
 
    PLUGINRUNNERCONF="${DESTDIR}${CONFDIR}/plugin-runner.conf"
130
 
    echo "--groupid=${mandos_group}" >> "$PLUGINRUNNERCONF"
 
130
    sed --in-place --expression="1i--groupid=${mandos_group}" \
 
131
        "${DESTDIR}${CONFDIR}/plugin-runner.conf"
131
132
fi
132
133
 
133
134
# Key files 
134
 
for file in  "$keydir"/*; do
 
135
for file in "$keydir"/*; do
135
136
    if [ -d "$file" ]; then
136
137
        continue
137
138
    fi
166
167
        chmod a+rX "${DESTDIR}$dir"
167
168
    fi
168
169
done
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
 
170
for dir in "${DESTDIR}"/lib* "${DESTDIR}"/usr/lib*; do
 
171
    if [ -d "$dir" ]; then
 
172
        find "$dir" \! -perm -u+rw,g+r -prune -or -print0 \
 
173
            | xargs --null --no-run-if-empty chmod a+rX
 
174
    fi
172
175
done