/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: 2011-10-09 16:38:18 UTC
  • mfrom: (513 trunk)
  • mto: (237.4.29 release)
  • mto: This revision was merged to the branch mainline in revision 514.
  • Revision ID: teddy@recompile.se-20111009163818-ihb35bqq0iat18k2
Merge from trunk.

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 \
56
 
                || getent passwd nobody \
57
 
                || echo ::65534::::; } \
58
 
        | awk --field-separator=: '{ print $3 }'`" 
59
 
mandos_group="`{ getent group _mandos \
60
 
                || getent group mandos \
61
 
                || getent group nogroup \
62
 
                || echo ::65534:; } \
63
 
        | 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"
64
61
 
65
62
# The Mandos network client uses the network
66
63
auto_add_modules net
91
88
        continue
92
89
    fi
93
90
    case "$base" in
94
 
        *~|.*|\#*\#|*.dpkg-old|*.dpkg-bak|*.dpkg-new|*.dpkg-divert) : ;;
95
 
        "*") :;;
96
 
        *) 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}" ;;
97
95
    esac
98
96
done
99
97
 
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) : ;;
105
 
        "*") :;;
106
 
        *) copy_exec "$file" "${PLUGINDIR}";;
 
102
        *~|.*|\#*\#|*.dpkg-old|*.dpkg-bak|*.dpkg-new|*.dpkg-divert)
 
103
            : ;;
 
104
        "*") : ;;
 
105
        *) copy_exec "$file" "${PLUGINDIR}" ;;
107
106
    esac
108
107
done
109
108
 
115
114
fi
116
115
 
117
116
# Config files
118
 
for file in /etc/mandos/*; do
 
117
for file in /etc/mandos/plugin-runner.conf; do
119
118
    if [ -d "$file" ]; then
120
119
        continue
121
120
    fi
123
122
done
124
123
 
125
124
if [ ${mandos_user} != 65534 ]; then
126
 
    PLUGINRUNNERCONF="${DESTDIR}${CONFDIR}/plugin-runner.conf"
127
 
    cat <<-EOF >> "$PLUGINRUNNERCONF"
128
 
        
129
 
        --userid=${mandos_user}
130
 
EOF
 
125
    sed --in-place --expression="1i--userid=${mandos_user}" \
 
126
        "${DESTDIR}${CONFDIR}/plugin-runner.conf"
131
127
fi
132
128
 
133
129
if [ ${mandos_group} != 65534 ]; then
134
 
    PLUGINRUNNERCONF="${DESTDIR}${CONFDIR}/plugin-runner.conf"
135
 
    cat <<-EOF >> "$PLUGINRUNNERCONF"
136
 
        
137
 
        --groupid=${mandos_group}
138
 
EOF
 
130
    sed --in-place --expression="1i--groupid=${mandos_group}" \
 
131
        "${DESTDIR}${CONFDIR}/plugin-runner.conf"
139
132
fi
140
133
 
141
 
# Key files 
142
 
for file in  "$keydir"/*; do
 
134
# Key files
 
135
for file in "$keydir"/*; do
143
136
    if [ -d "$file" ]; then
144
137
        continue
145
138
    fi