Attachment 195341 Details for Bug 290241 – patch against chkconfig-1.3.30.1

[patch] patch against chkconfig-1.3.30.1

chkconfig.patch (text/plain), 3.84 KB, created by Mark D. Foster on 2007-09-13 23:01:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark D. Foster

Created: 2007-09-13 23:01:37 UTC

Size: 3.84 KB

patch

obsolete

>diff -u -r chkconfig-1.3.30.1/chkconfig.8 chkconfig-1.3.30.2/chkconfig.8
>--- chkconfig-1.3.30.1/chkconfig.8	2005-02-02 13:36:41.000000000 -0800
>+++ chkconfig-1.3.30.2/chkconfig.8	2007-09-13 15:48:07.812370954 -0700
>@@ -4,7 +4,7 @@
> chkconfig \- updates and queries runlevel information for system services
> 
> .SH SYNOPSIS
>-\fBchkconfig\fR \fB--list\fR [\fIname\fR]
>+\fBchkconfig\fR [--list] [\fIname\fR]
> .br
> \fBchkconfig\fR \fB--add\fR \fIname\fR
> .br
>@@ -33,12 +33,9 @@
> startup information for services, changing the startup information
> for services, and checking the startup state of a particular service.
> 
>-When \fBchkconfig\fR is run without any options, it displays usage
>-information.  If only a service name is given, it checks to see if
>-the service is configured to be started in the current runlevel. If
>-it is, \fBchkconfig\fR returns true; otherwise it returns false. The
>-\fB--level\fR option may be used to have \fBchkconfig\fR query an
>-alternative runlevel rather than the current one.
>+When \fBchkconfig\fR is run without any options, it lists the current
>+startup information.  If only a service name is given, the current
>+startup information is shown for just that service.  
> 
> If one of \fBon\fR, \fBoff\fR, or \fRreset\fR is specified after the
> service name, \fBchkconfig\fR changes the startup information for the
>diff -u -r chkconfig-1.3.30.1/chkconfig.c chkconfig-1.3.30.2/chkconfig.c
>--- chkconfig-1.3.30.1/chkconfig.c	2006-09-07 11:58:40.000000000 -0700
>+++ chkconfig-1.3.30.2/chkconfig.c	2007-09-13 15:50:12.568866046 -0700
>@@ -32,7 +32,7 @@
>     fprintf(stderr, _("This may be freely redistributed under the terms of "
> 			"the GNU Public License.\n"));
>     fprintf(stderr, "\n");
>-    fprintf(stderr, _("usage:   %s --list [name]\n"), progname);
>+    fprintf(stderr, _("usage:   %s [--list] [name]\n"), progname);
>     fprintf(stderr, _("         %s --add <name>\n"), progname);
>     fprintf(stderr, _("         %s --del <name>\n"), progname);
>     fprintf(stderr, _("         %s [--level <levels>] <name> %s\n"), progname, "<on|off|reset|resetpriorities>");
>@@ -528,7 +528,10 @@
> 	exit(0);
>     }
> 
>-    if (help || argc == 1) usage();
>+    if (help) {
>+	usage();
>+	exit(0);
>+    }
> 
>     if ((listItem + addItem + delItem) > 1) {
> 	fprintf(stderr, _("only one of --list, --add, or --del may be "
>@@ -554,19 +557,22 @@
> 		    name = basename(name);
> 	return delService(name);
>     } else if (listItem) {
>-	char * item = (char *)poptGetArg(optCon);
>-
>-	if (item && poptGetArg(optCon)) usage();
>-
>-	return listService(item);
>+	char * name = (char *)poptGetArg(optCon);
>+	return listService(name);
>     } else {
> 	char * name = (char *)poptGetArg(optCon);
> 	char * state = (char *)poptGetArg(optCon);
> 	int where = 0, level = -1;
> 
> 	if (!name) {
>-		usage();
>+	    return listService(0);
>+	    exit(0);
>+	}
>+	if (name && !state) {
>+	    return listService(name);
>+	    exit(0);
> 	}
>+		
> 	if (levels) {
> 	    where = parseLevels(levels, 0);
> 	    if (where == -1) usage();
>@@ -610,7 +616,7 @@
> 	else if (!strcmp(state, "resetpriorities"))
> 	    return setService(name, where, -2);
> 	else
>-	    usage();
>+	    return listService(name);
>     }
> 
>     usage();
>diff -u -r chkconfig-1.3.30.1/chkconfig.spec chkconfig-1.3.30.2/chkconfig.spec
>--- chkconfig-1.3.30.1/chkconfig.spec	2006-12-01 11:18:20.000000000 -0800
>+++ chkconfig-1.3.30.2/chkconfig.spec	2007-09-13 14:43:56.435020152 -0700
>@@ -1,6 +1,6 @@
> Summary: A system tool for maintaining the /etc/rc*.d hierarchy.
> Name: chkconfig
>-Version: 1.3.30.1
>+Version: 1.3.30.2
> Release: 1
> License: GPL
> Group: System Environment/Base
>@@ -76,6 +76,9 @@
> %{_mandir}/*/ntsysv.8*
> 
> %changelog
>+* Thu Sep 13 2007 Mark Foster <mark@foster.cc> 1.3.30.2-1
>+- implement implied --list feature when no other actionable options exist
>+
> * Fri Dec  1 2006 Bill Nottingham <notting@redhat.com> 1.3.30.1-1
> - translation updates: as, ka, lv, ml, te (#216617)
>

Actions: View | Diff

Attachments on bug 290241: 195341 | 252191