From 22ff1d4eee0838b07d4ab578932eeede2eb6ccaa Mon Sep 17 00:00:00 2001 From: Evan Broder Date: Sat, 1 Nov 2008 12:28:57 -0400 Subject: [PATCH] Cleanup the init script and copyright file in xvm-iscsi-config svn path=/trunk/packages/xvm-iscsi-config/; revision=1507 --- debian/copyright | 18 +++++++-- debian/xvm-iscsi-config.init | 85 +++--------------------------------------- 2 files changed, 20 insertions(+), 83 deletions(-) diff --git a/debian/copyright b/debian/copyright index e5cc6d8..361ca8f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,16 @@ -This package was created for the XVM project of the MIT -Student Information Processing Board. +This software was written as part of the Invirt project . -You may use it, etc, under the GNU GPL, version 2 or later. +Copyright : + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + +On Debian systems, the complete text of the GNU General Public License +can be found in the file /usr/share/common-licenses/GPL. diff --git a/debian/xvm-iscsi-config.init b/debian/xvm-iscsi-config.init index e792497..fc44178 100755 --- a/debian/xvm-iscsi-config.init +++ b/debian/xvm-iscsi-config.init @@ -11,89 +11,14 @@ # Author: SIPB XVM Project -# Do NOT "set -e" - -# PATH should only include /usr/* if it runs after the mountnfs.sh script -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="Re-generate the iSCSI config" NAME=xvm-iscsi-config +DESC="Re-generate the iSCSI config" +PATH=/sbin:/usr/sbin:/bin:/usr/bin +GEN_FILES=/etc/iscsi/iscsid.conf.xvm # Read configuration variable file if it is present [ -r /etc/default/$NAME ] && . /etc/default/$NAME -# Load the VERBOSE setting and other rcS variables -. /lib/init/vars.sh - -# Define LSB log_* functions. -# Depend on lsb-base (>= 3.0-6) to ensure that this file is present. -. /lib/lsb/init-functions - -# -# Function that starts the daemon/service -# -do_start() -{ - # Return - # 0 if daemon has been started - # 1 if daemon was already running - # 2 if daemon could not be started - for i in /etc/iscsi/iscsid.conf.xvm - do mako-render $i.mako > $i - done -} - -# -# Function that stops the daemon/service -# -do_stop() -{ - # Return - # 0 if daemon has been stopped - # 1 if daemon was already stopped - # 2 if daemon could not be stopped - # other if a failure occurred - return 0 -} - -case "$1" in - start) - [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" - do_start - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - stop) - [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" - do_stop - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - restart|force-reload) - log_daemon_msg "Restarting $DESC" "$NAME" - do_stop - case "$?" in - 0|1) - do_start - case "$?" in - 0) log_end_msg 0 ;; - 1) log_end_msg 1 ;; # Old process is still running - *) log_end_msg 1 ;; # Failed to start - esac - ;; - *) - # Failed to stop - log_end_msg 1 - ;; - esac - ;; - *) - echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 - exit 3 - ;; -esac +. /lib/init/config-init.sh -: +config_init "$1" -- 1.7.9.5