added substitutions/tests for iptables, modprobe, rmmod and nameif
authorEnrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Tue, 30 Mar 2004 19:00:34 +0000 (19:00 +0000)
committerEnrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Tue, 30 Mar 2004 19:00:34 +0000 (19:00 +0000)
(required for Liam Helmer's dummy-interfaces)

git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1397 94cd875c-1c1d-0410-91d2-eb244daf1a30

util-vserver/Makefile.am
util-vserver/configure.ac
util-vserver/scripts/util-vserver-vars.pathsubst

index 83cef0e..4286bff 100644 (file)
@@ -153,14 +153,19 @@ pathsubst_RULES = s!@'PKGLIBDIR'@!$(pkglibdir)!g; \
                        s!@'AWK'@!$(AWK)!g; \
                        s!@'GREP'@!$(GREP)!g; \
                        s!@'IP'@!$(IP)!g; \
+                       s!@'IPTABLES'@!$(IPTABLES)!g; \
+                       s!@'MODPROBE'@!$(MODPROBE)!g; \
                        s!@'MOUNT'@!$(MOUNT)!g; \
-                       s!@'UMOUNT'@!$(UMOUNT)!g; \
+                       s!@'NAMEIF'@!$(NAMEIF)!g; \
                        s!@'NICE'@!$(NICE)!g; \
-                       s!@'VCONFIG'@!$(VCONFIG)!g; \
                        s!@'PS'@!$(PS)!g; \
+                       s!@'RMMOD'@!$(RMMOD)!g; \
+                       s!@'TAR'@!$(TAR)!g; \
+                       s!@'UMOUNT'@!$(UMOUNT)!g; \
+                       s!@'VCONFIG'@!$(VCONFIG)!g; \
                        s!@'WC'@!$(WC)!g; \
                        s!@'WGET'@!$(WGET)!g; \
-                       s!@'TAR'@!$(TAR)!g; \
+                       s!@'XSLTPROC'@!$(XSLTPROC)!g; \
                        s!@'ENSC_HAVE_C99_COMPILER_TRUE'@!\@ENSC_HAVE_C99_COMPILER_TRUE@ !g; \
                        s!@'ENSC_HAVE_C99_COMPILER_FALSE'@!\@ENSC_HAVE_C99_COMPILER_FALSE@ !g; \
                        s!@'ENSC_HAVE_CXX_COMPILER_TRUE'@!\@ENSC_HAVE_CXX_COMPILER_TRUE@ !g; \
index c6c9c11..5341452 100644 (file)
@@ -24,7 +24,7 @@ dnl distribution terms that you use for the rest of that program.
 dnl  
 
 AC_PREREQ(2.57)
-AC_INIT(util-vserver, 0.29.207, enrico.scholz@informatik.tu-chemnitz.de)
+AC_INIT(util-vserver, 0.29.208, enrico.scholz@informatik.tu-chemnitz.de)
 AC_CONFIG_SRCDIR([src/capchroot.c])
 AC_CONFIG_HEADER([config.h])
 
@@ -52,6 +52,10 @@ AC_PATH_PROGS(NICE,    [nice],    [nice],        [ $check_paths ])
 AC_PATH_PROGS(VCONFIG, [vconfig], [vconfig],     [ $check_paths ])
 AC_PATH_PROGS(WC,      [wc],      [wc],          [ $check_paths ])
 AC_PATH_PROGS(PS,      [ps],      [/bin/ps],     [ $check_paths ])
+AC_PATH_PROGS(MODPROBE, [modprobe], [/sbin/modprobe], [ $check_paths ])
+AC_PATH_PROGS(RMMOD,    [rmmod],    [/sbin/rmmod],    [ $check_paths ])
+AC_PATH_PROGS(NAMEIF,   [nameif],   [/sbin/nameif],   [ $check_paths ])
+AC_PATH_PROGS(IPTABLES, [iptables], [/sbin/iptables], [ $check_paths ])
 AC_PATH_PROGS(XSLTPROC, [xsltproc], [xsltproc])
 AC_PATH_PROGS(SED,      [sed],      [sed])
 AC_PATH_PROGS(CMP,      [cmp],      [cmp])
index cbb5037..1faa01f 100644 (file)
@@ -87,13 +87,17 @@ _VUNIFY="$PKGLIBDIR/vunify"
 _AWK="@AWK@"
 _GREP="@GREP@"
 _IP="@IP@"
+_IPTABLES="@IPTABLES@"
+_MODPROBE="@MODPROBE@"
 _MOUNT="@MOUNT@"
+_NAMEIF="@NAMEIF@"
 _NICE="@NICE@"
+_RMMOD="@RMMOD@"
+_TAR="@TAR@"
 _UMOUNT="@UMOUNT@"
 _VCONFIG="@VCONFIG@"
 _WC="@WC@"
 _WGET="@WGET@"
-_TAR="@TAR@"
 
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=106057
 WORKAROUND_106057=1