diff -u sysvinit-2.86.ds1/debian/changelog sysvinit-2.86.ds1/debian/changelog --- sysvinit-2.86.ds1/debian/changelog +++ sysvinit-2.86.ds1/debian/changelog @@ -1,3 +1,14 @@ +sysvinit (2.86.ds1-59ubuntu3) intrepid; urgency=low + + * debian/control: updated to mention that sysvinit-utils provides "service". + * debian/patches/00list: added 94_service.dpatch (LP: #259043). + * debian/patches/94_service.dpatch: patch to add the service shell script to + src/, and the manpage to man/. + * src/service: imported and Debianized the Red Hat "service" shell script. + * man/service.8: imported the Red Hat manpage for "service". + + -- Dustin Kirkland Tue, 19 Aug 2008 14:23:42 +0100 + sysvinit (2.86.ds1-59ubuntu2) intrepid; urgency=low * Since our last merge, /etc/init.d/rc.local was marked as a conffile. diff -u sysvinit-2.86.ds1/debian/rules sysvinit-2.86.ds1/debian/rules --- sysvinit-2.86.ds1/debian/rules +++ sysvinit-2.86.ds1/debian/rules @@ -110,6 +110,7 @@ rm -f $(tmp)/usr/share/man/man1/last.1 rm -f $(tmp)/usr/share/man/man1/lastb.1 rm -f $(tmp)/usr/share/man/man1/mesg.1 + rm -f $(tmp)/usr/share/man/man1/service.8 rm -f $(tmp)/usr/share/man/man8/pidof.8 rm -f $(tmp)/usr/share/man/man1/mountpoint.1 rm -f $(tmp)/sbin/killall5 @@ -117,6 +118,7 @@ rm -f $(tmp)/usr/bin/last rm -f $(tmp)/usr/bin/lastb rm -f $(tmp)/usr/bin/mesg + rm -f $(tmp)/usr/bin/service rm -f $(tmp)/bin/pidof rm -f $(tmp)/bin/mountpoint rmdir $(tmp)/usr/share/man/man1 @@ -152,6 +154,7 @@ install -o root -g root -m 755 src/sulogin $(tmp)/sbin install -o root -g root -m 755 src/last $(tmp)/usr/bin install -o root -g root -m 755 src/mesg $(tmp)/usr/bin + install -o root -g root -m 755 src/service $(tmp)/usr/bin strip -s -R .comment $(tmp)/sbin/killall5 strip -s -R .comment $(tmp)/sbin/sulogin strip -s -R .comment $(tmp)/usr/bin/last @@ -163,6 +166,7 @@ install -o root -g root -m 644 man/last.1 $(tmp)/usr/share/man/man1 install -o root -g root -m 644 man/lastb.1 $(tmp)/usr/share/man/man1 install -o root -g root -m 644 man/mesg.1 $(tmp)/usr/share/man/man1 + install -o root -g root -m 644 man/service.8 $(tmp)/usr/share/man/man1 install -o root -g root -m 644 man/pidof.8 $(tmp)/usr/share/man/man8 gzip -9f $(tmp)/usr/share/man/man*/*.[0-9] install -o root -g root -m 644 debian/copyright \ diff -u sysvinit-2.86.ds1/debian/control sysvinit-2.86.ds1/debian/control --- sysvinit-2.86.ds1/debian/control +++ sysvinit-2.86.ds1/debian/control @@ -34,7 +34,7 @@ This package contains the important System-V-like utilities. . Specifically, this package includes: - killall5, last, lastb, mesg, pidof, sulogin + killall5, last, lastb, mesg, pidof, service, sulogin Package: sysv-rc Architecture: all diff -u sysvinit-2.86.ds1/debian/patches/00list sysvinit-2.86.ds1/debian/patches/00list --- sysvinit-2.86.ds1/debian/patches/00list +++ sysvinit-2.86.ds1/debian/patches/00list @@ -45,0 +46 @@ +94_service.dpatch only in patch2: unchanged: --- sysvinit-2.86.ds1.orig/debian/patches/94_service.dpatch +++ sysvinit-2.86.ds1/debian/patches/94_service.dpatch @@ -0,0 +1,196 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +# 94_service.dpatch by Dustin Kirkland +# Create a wrapper for running init scripts in /etc/init.d. +# Code obtained from, used, and modified in accordance with the GPLv2: +# http://download.fedora.redhat.com/pub/fedora/linux/releases/9/Fedora/source/SRPMS/initscripts-8.76-1.src.rpm + +@DPATCH@ + +diff -uprN sysvinit-2.86.ds1.orig/man/service.8 sysvinit-2.86.ds1/man/service.8 +--- sysvinit-2.86.ds1.orig/man/service.8 1970-01-01 01:00:00.000000000 +0100 ++++ sysvinit-2.86.ds1/man/service.8 2008-08-19 13:40:11.400126043 +0100 +@@ -0,0 +1,76 @@ ++.\" A man page for service(8). -*- nroff -*- ++.\" ++.\" Copyright (C) 2006 Red Hat, Inc. All rights reserved. ++.\" ++.\" This copyrighted material is made available to anyone wishing to use, ++.\" modify, copy, or redistribute it subject to the terms and conditions of the ++.\" GNU General Public License v.2. ++.\" ++.\" 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. ++.\" ++.\" You should have received a copy of the GNU General Public License along ++.\" with this program; if not, write to the Free Software Foundation, Inc., ++.\" 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++.\" ++.\" Author: Miloslav Trmac ++.TH service 8 "Jan 2006" ++ ++.SH NAME ++service \- run a System V init script ++ ++.SH SYNOPSIS ++\fBservice\fR \fISCRIPT\fR \fICOMMAND\fR [\fIOPTIONS\fR] ++ ++\fBservice \-\-status\-all\fR ++ ++\fBservice\fR \fB\-\-help\fR | \fB\-h\fR | \fB\-\-version\fR ++ ++.SH DESCRIPTION ++.B service ++runs a System V init script in as predictable environment as possible, ++removing most environment variables ++and with current working directory set to \fB/\fR. ++ ++The ++.I SCRIPT ++parameter specifies a System V init script, ++located in \fB/etc/init.d/\fISCRIPT\fR. ++The supported values of ++.I COMMAND ++depend on the invoked script, ++.B service ++passes ++.I COMMAND ++and ++.I OPTIONS ++it to the init script unmodified. ++All scripts should support at least the ++.B start ++and ++.B stop ++commands. ++As a special case, if ++.I COMMAND ++is \fB\-\-full-restart\fR, the script is run twice, first with the ++.B stop ++command, then with the ++.B start ++command. ++ ++.B service \-\-status\-all ++runs all init scripts, in alphabetical order, with the ++.B status ++command. ++ ++.SH FILES ++.TP ++\fB/etc/init.d\fR ++The directory containing System V init scripts. ++ ++.SH ENVIRONMENT ++.TP ++\fBLANG\fR, \fBTERM\fR ++The only environment variables passed to the init scripts. +diff -uprN sysvinit-2.86.ds1.orig/src/service sysvinit-2.86.ds1/src/service +--- sysvinit-2.86.ds1.orig/src/service 1970-01-01 01:00:00.000000000 +0100 ++++ sysvinit-2.86.ds1/src/service 2008-08-19 13:48:36.827894794 +0100 +@@ -0,0 +1,104 @@ ++#!/bin/sh ++ ++########################################################################### ++# /usr/bin/service ++# ++# A convenient wrapper for the /etc/init.d init scripts. ++# ++# This script is a modified version of the /sbin/service utility found on ++# Red Hat/Fedora systems (licensed GPLv2+). ++# ++# Copyright (C) 2008 Canonical Ltd. ++# * August 2008 - Dustin Kirkland ++# ++# 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. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# ++# On Debian GNU/Linux systems, the complete text of the GNU General ++# Public License can be found in `/usr/share/common-licenses/GPL'. ++########################################################################### ++ ++ ++is_ignored_file() { ++ case "$1" in ++ skeleton | README | *.dpkg-dist | *.dpkg-old | rc | rcS | single | reboot | bootclean.sh) ++ return 0 ++ ;; ++ esac ++ return 1 ++} ++ ++VERSION="`basename $0` ver. 0.91-ubuntu1" ++USAGE="Usage: `basename $0` < option > | --status-all | \ ++[ service_name [ command | --full-restart ] ]" ++INVOKERC="invoke-rc.d --force --quiet" ++SERVICE= ++SERVICEDIR="/etc/init.d" ++OPTIONS= ++ ++if [ $# -eq 0 ]; then ++ echo "${USAGE}" >&2 ++ exit 1 ++fi ++ ++cd / ++while [ $# -gt 0 ]; do ++ case "${1}" in ++ --help | -h | --h* ) ++ echo "${USAGE}" >&2 ++ exit 0 ++ ;; ++ --version | -V ) ++ echo "${VERSION}" >&2 ++ exit 0 ++ ;; ++ *) ++ if [ -z "${SERVICE}" -a $# -eq 1 -a "${1}" = "--status-all" ]; then ++ cd ${SERVICEDIR} ++ for SERVICE in * ; do ++ case "${SERVICE}" in ++ functions | halt | killall | single| linuxconf| kudzu) ++ ;; ++ *) ++ if ! is_ignored_file "${SERVICE}" \ ++ && [ -x "${SERVICEDIR}/${SERVICE}" ]; then ++ env -i LANG="$LANG" PATH="$PATH" TERM="$TERM" $INVOKERC "$SERVICE" status ++ fi ++ ;; ++ esac ++ done ++ exit 0 ++ elif [ $# -eq 2 -a "${2}" = "--full-restart" ]; then ++ SERVICE="${1}" ++ if [ -x "${SERVICEDIR}/${SERVICE}" ]; then ++ env -i LANG="$LANG" PATH="$PATH" TERM="$TERM" $INVOKERC "$SERVICE" stop ++ env -i LANG="$LANG" PATH="$PATH" TERM="$TERM" $INVOKERC "$SERVICE" start ++ exit $? ++ fi ++ elif [ -z "${SERVICE}" ]; then ++ SERVICE="${1}" ++ else ++ OPTIONS="${OPTIONS} ${1}" ++ fi ++ shift ++ ;; ++ esac ++done ++ ++if [ -x "${SERVICEDIR}/${SERVICE}" ]; then ++ env -i LANG="$LANG" PATH="$PATH" TERM="$TERM" $INVOKERC "$SERVICE" ${OPTIONS} ++else ++ echo $"${SERVICE}: unrecognized service" >&2 ++ exit 1 ++fi