Fix rc-update, #187487 and release rc2.

This commit is contained in:
Roy Marples 2007-08-04 15:05:12 +00:00
parent 9169c51d39
commit 3e5526fd76
6 changed files with 15 additions and 3 deletions

View File

@ -1,6 +1,12 @@
# ChangeLog for Gentoo System Intialization ("rc") scripts
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPLv2
* baselayout-2.0.0_rc2 (04 Aug 2007)
04 Aug 2007; Roy Marples <uberlord@gentoo.org>:
rc-update works again, #187487.
03 Aug 2007; Roy Marples <uberlord@gentoo.org>:
Fix adding multiple IP addresses, #187526.

View File

@ -10,7 +10,7 @@
SUBDIRS = conf.d etc init.d man net sh share src
NAME = baselayout
VERSION = 2.0.0_rc1
VERSION = 2.0.0_rc2
PKG = $(NAME)-$(VERSION)

View File

@ -33,7 +33,8 @@ LIBRCSO = librc.so.$(LIBRCSOVER)
LIBRCOBJS = librc.o librc-depend.o librc-daemon.o librc-misc.o librc-strlist.o
RCOBJS = env-update.o fstabinfo.o mountinfo.o \
rc-depend.o rc-plugin.o rc-status.o runscript.o start-stop-daemon.o
rc-depend.o rc-plugin.o rc-status.o rc-update.o runscript.o \
start-stop-daemon.o
LIB_TARGETS = $(LIBEINFOSO) $(LIBRCSO)
SBIN_TARGETS = rc

View File

@ -12,6 +12,7 @@ int fstabinfo (int argc, char **argv);
int mountinfo (int argc, char **argv);
int rc_depend (int argc, char **argv);
int rc_status (int argc, char **argv);
int rc_update (int argc, char **argv);
int runscript (int argc, char **argv);
int start_stop_daemon (int argc, char **argv);

View File

@ -13,6 +13,7 @@
#include <string.h>
#include <unistd.h>
#include "builtins.h"
#include "einfo.h"
#include "rc.h"
#include "rc-misc.h"
@ -45,7 +46,7 @@ static bool add (const char *runlevel, const char *service)
return (retval);
}
int main (int argc, char **argv)
int rc_update (int argc, char **argv)
{
int i;
int j;

View File

@ -717,6 +717,9 @@ int main (int argc, char **argv)
exit (rc_depend (argc, argv));
else if (strcmp (applet, "rc-status") == 0)
exit (rc_status (argc, argv));
else if (strcmp (applet, "rc-update") == 0 ||
strcmp (applet, "update-rc") == 0)
exit (rc_update (argc, argv));
else if (strcmp (applet, "runscript") == 0)
exit (runscript (argc, argv));
else if (strcmp (applet, "start-stop-daemon") == 0)