Masato Taruishi
taru****@users*****
2004年 10月 9日 (土) 15:40:13 JST
===================================================================
RCS file: ultrapossum/Makefile.am,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ultrapossum/Makefile.am 2004/10/07 08:01:49 1.21
+++ ultrapossum/Makefile.am 2004/10/09 06:40:13 1.22
@@ -4,7 +4,7 @@
bin_SCRIPTS = ultrapossum-config
pkgdata_DATA = \
- modules term variable
+ modules term variable pysical logical
pkgdata_SCRIPTS = sshman envexec
@@ -25,14 +25,23 @@
aclocal_DATA = ultrapossum.m4
variable: modules init.d/variable Makefile
- egrep "[A-Z_][A-Z_]*=" modules | cut -d= -f1 | grep -v IFS | tr -d '# ' | sort | uniq > $@
- sort init.d/variable $@ | uniq >> $@T
- mv $@T $@
+ egrep "[A-Z_][A-Z_]*=" modules | cut -d= -f1 | grep -v IFS | tr -d '# ' | sort | uniq > $@T
+ sort init.d/variable $@T | uniq > $@
+
+pysical: modules init.d/pysical Makefile
+ egrep "[A-Z_][A-Z_]*=" modules | grep ultrapossum_getconf | cut -d= -f1 | grep -v IFS | tr -d '# ' | sort | uniq > $@T
+ sort init.d/pysical $@T | uniq > $@
+
+logical: pysical variable
+ diff variable pysical | egrep "^< " | cut -d' ' -f2 > logical
init.d/variable:
$(MAKE) -C init.d variable
-CLEANFILES = variable update-ultrapossum.8 ultrapossum-config.1
+init.d/pysical:
+ $(MAKE) -C init.d pysical
+
+CLEANFILES = variable pysical logical update-ultrapossum.8 ultrapossum-config.1
CONFIGS = ultrapossum.cf default.cf config.cf
===================================================================
RCS file: ultrapossum/ultrapossum-config.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ultrapossum/ultrapossum-config.in 2004/10/08 06:40:20 1.26
+++ ultrapossum/ultrapossum-config.in 2004/10/09 06:40:13 1.27
@@ -63,10 +63,10 @@
Prints all the plugins.
-=item B<variable> [<modules...>]
+=item B<variable> [-l] [<modules...>]
Prints variables of the spcified modules. When no <modules..> argument given,
-all variables are printed.
+all variables are printed. If B<-l> given, a long listing format will be used.
=item B<status> [<modules...>]
@@ -106,6 +106,7 @@
PACKAGE=${PACKAGE:- ＠ PACKAGE@}
. $SHAREDIR/init.d/10compat
+. $SHAREDIR/init.d/10funcs
case "x$1" in
xinit)
@@ -118,7 +119,20 @@
xvariable)
. $SHAREDIR/init.d/10config
shift
- getvariable "$@"
+ if test "x$1" = "x-l"; then
+ shift
+ l=`getlogical "$@"`
+ getvariable "$@" | while read v; do
+ if include "$v" "$l"; then
+ echo -n " l "
+ else
+ echo -n " p "
+ fi
+ echo "$v"
+ done
+ else
+ getvariable "$@"
+ fi
;;
xget)
shift