/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 init.d-mandos

  • Committer: Teddy Hogeborn
  • Date: 2013-10-28 08:38:47 UTC
  • Revision ID: teddy@recompile.se-20131028083847-cper3srg5o29r2ge
Use architecture libdir.

Instead of always using /usr/lib/mandos, use whatever the architecture
specifies, like /usr/lib/x86_64-linux-gnu/mandos or /usr/lib64/mandos.
Still use /usr/lib/mandos as a fallback.

* Makefile (LIBDIR): New.
 (install-client-nokey, uninstall-client): Use LIBDIR instead of
                                           $(PREFIX)/lib.
* initramfs-tools-hook: Detect correct libdir and copy from there.

Reported-by: Nathanael D. Noblet <nathanael@gnat.ca>
Suggested-by: Nathanael D. Noblet <nathanael@gnat.ca>

Show diffs side-by-side

added added

removed removed

Lines of Context:
init.d-mandos
1
1
#! /bin/sh
2
2
### BEGIN INIT INFO
3
3
# Provides:          mandos
4
 
# Required-Start:    $remote_fs $syslog avahi-daemon
5
 
# Required-Stop:     $remote_fs $syslog avahi-daemon
 
4
# Required-Start:    $remote_fs $syslog avahi
 
5
# Required-Stop:     $remote_fs $syslog avahi
6
6
# Default-Start:     2 3 4 5
7
7
# Default-Stop:      0 1 6
8
8
# Short-Description: Mandos server
44
44
. /lib/init/vars.sh
45
45
 
46
46
# Define LSB log_* functions.
47
 
# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
48
 
# and status_of_proc is working.
 
47
# Depend on lsb-base (>= 3.2-14) to ensure that this file is present.
49
48
. /lib/lsb/init-functions
50
49
 
51
50
#
123
122
                2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
124
123
        esac
125
124
        ;;
126
 
  status)
127
 
        status_of_proc "$DAEMON" "$NAME" -p "$PIDFILE" && exit 0 || exit $?
128
 
        ;;
129
125
  #reload|force-reload)
130
126
        #
131
127
        # If do_reload() is not implemented then leave this commented out
152
148
                esac
153
149
                ;;
154
150
          *)
155
 
                # Failed to stop
 
151
                # Failed to stop
156
152
                log_end_msg 1
157
153
                ;;
158
154
        esac
159
155
        ;;
 
156
  status)
 
157
        status_of_proc "$DAEMON" "$NAME" -p "$PIDFILE"
 
158
        ;;
160
159
  *)
161
160
        #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
162
 
        echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
 
161
        echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
163
162
        exit 3
164
163
        ;;
165
164
esac