/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 Makefile

  • Committer: Teddy Hogeborn
  • Date: 2008-09-06 15:34:21 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080906153421-605ydhwyo404krh9
* initramfs-tools-hook: Use long options where available.  Use only
                        one "test" invocation instead of several.

* mandos-keygen: Use only one "test" invocation instead of several.
                 Use long options where available.  Strip newline from
                 entered password.

* plugin-runner.c (print_out_password): Do not strip trailing newline.
  (fallback): Strip trailing newline from getpass().

* plugin-runner.xml (PLUGINS): Plugins should not print trailing
                               newlines.

* plugins.d/password-prompt.c (main): Strip trailing newline.

* plugins.d/password-request.c (main): Bug fix: Read "pubkey.txt", not
                                       "pupkey.txt".

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
126
126
        install --mode=u=rw,go=r $^ $@
127
127
confdir/clients.conf: clients.conf keydir/seckey.txt
128
128
        install --directory confdir
129
 
        install --mode=u=rw,g=r $< $@
 
129
        install --mode=u=rw $< $@
130
130
# Add a client password
131
131
        ./mandos-keygen --dir keydir --password >> $@
132
132
 
138
138
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
139
139
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
140
140
                mandos.conf
141
 
        install --mode=u=rw,g=r --target-directory=$(CONFDIR) \
 
141
        install --mode=u=rw --target-directory=$(CONFDIR) \
142
142
                clients.conf
143
143
        install --mode=u=rwx,go=rx init.d-mandos /etc/init.d/mandos
144
144
        install --mode=u=rw,go=r default-mandos /etc/default/mandos
158
158
                $(PREFIX)/lib/mandos/plugins.d
159
159
        if [ "$(CONFDIR)/plugins.d" \
160
160
                        != "$(PREFIX)/lib/mandos/plugins.d" ]; then \
161
 
                        install --directory "$(CONFDIR)/plugins.d"; \
162
 
                fi
 
161
                install --mode=u=rwx \
 
162
                        --directory "$(CONFDIR)/plugins.d"; \
 
163
        fi
163
164
        install --mode=u=rwx,go=rx \
164
165
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
165
166
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
188
189
                > $(MANDIR)/man8/password-prompt.8mandos.gz
189
190
        gzip --best --to-stdout plugins.d/password-request.8mandos \
190
191
                > $(MANDIR)/man8/password-request.8mandos.gz
 
192
# Post-installation stuff
191
193
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
192
194
        update-initramfs -k all -u
193
195
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
211
213
                $(PREFIX)/lib/mandos/plugin-runner \
212
214
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
213
215
                $(PREFIX)/lib/mandos/plugins.d/password-request \
 
216
                $(PREFIX)/lib/mandos/plugins.d/usplash \
214
217
                /usr/share/initramfs-tools/hooks/mandos \
215
218
                /usr/share/initramfs-tools/conf-hooks.d/mandos \
 
219
                /usr/share/initramfs-tools/scripts/local-top/mandos \
216
220
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
217
221
                $(MANDIR)/man8/mandos-keygen.8.gz \
218
222
                $(MANDIR)/man8/password-prompt.8mandos.gz \
219
223
                $(MANDIR)/man8/password-request.8mandos.gz
220
224
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
221
 
                 $(PREFIX)/lib/mandos $(CONFDIR)
 
225
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
222
226
        update-initramfs -k all -u
223
227
 
224
228
purge: purge-server purge-client
225
229
 
226
230
purge-server: uninstall-server
227
231
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
228
 
                /etc/default/mandos /etc/init.d/mandos
 
232
                /etc/default/mandos /etc/init.d/mandos \
 
233
                /var/run/mandos.pid
229
234
        -rmdir $(CONFDIR)
230
235
 
231
236
purge-client: uninstall-client