SOURCES: resolvconf.init - pldize

glen glen at pld-linux.org
Tue Nov 27 00:41:53 CET 2007


Author: glen                         Date: Mon Nov 26 23:41:53 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- pldize

---- Files affected:
SOURCES:
   resolvconf.init (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/resolvconf.init
diff -u SOURCES/resolvconf.init:1.1 SOURCES/resolvconf.init:1.2
--- SOURCES/resolvconf.init:1.1	Tue Nov 27 00:41:10 2007
+++ SOURCES/resolvconf.init	Tue Nov 27 00:41:47 2007
@@ -2,12 +2,11 @@
 #
 # resolvconf  --  Nameserver information manager
 #
-# This script is part of the resolvconf package
-# See /usr/share/doc/resolvconf/copyright
-
-# Don't use set -e; check return status instead
-
-[ -x /sbin/resolvconf ] || exit 0
+# chkconfig:	345 09 91
+#
+# description:	Nameserver information manager
+#
+# $Id$
 
 MYNAME="${0##*/}"
 PATH=/sbin:/bin
@@ -16,22 +15,27 @@
 RESOLVCONF_FILE="${RUN_DIR}/resolv.conf"
 ENABLE_UPDATES_FLAGFILE="${RUN_DIR}/enable-updates"
 
-. /lib/lsb/init-functions
+. /etc/rc.d/init.d/functions
 
 # $1 EXITSTATUS
 # [$2 MESSAGE]
 log_action_end_msg_and_exit()
 {
-	log_action_end_msg "$1" ${2:+"$2"}
+	echo ${2:+"$2"}
 	exit $1
 }
 
+log_action_begin_msg()
+{
+	show "$*"
+}
+
 update()
 {
 	[ -e "$ENABLE_UPDATES_FLAGFILE" ] || return 0
 	cd "$IFACE_DIR"
 	# "update" scripts must assume that interface files are in the PWD
-	run-parts ${1:+--arg="$1"} ${2:+--arg="$2"} /etc/resolvconf/update.d
+	run-parts /etc/resolvconf/update.d "$@"
 }
 
 enable_updates()
@@ -99,7 +103,7 @@
 	exit $?
 	;;
 *)
-	echo "Usage: /etc/init.d/resolvconf {start|stop|reload|restart|force-reload|enable-updates|disable-updates}" >&2
+	msg_usage "$0 {start|stop|reload|restart|force-reload|enable-updates|disable-updates}"
 	exit 3
 	;;
 esac
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/resolvconf.init?r1=1.1&r2=1.2&f=u



More information about the pld-cvs-commit mailing list