From: Jan Safranek <jsafrane@redhat.com>
Date: Tue, 14 Apr 2009 11:52:47 +0000 (+0200)
Subject: Generate paths in initscripts by configure script
X-Git-Tag: v0.34~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47045ddcf5e98fec52174fc075a7e61291aeaa75;p=thirdparty%2Flibcgroup.git

Generate paths in initscripts by configure script

Change the hardcoded paths in initscripts to dynamically generated ones. The
real executable path $bindir can be constructed using $prefix and $exec_prefix
variables, therefore it's necessary to define also these two.

The patch includes removal of old initscripts from git - they are generated
from .in file now.

I did not run autoreconf, I think the generated junk is being removed from git
soon.

Signed-off-by: Jan Safranek <jsafrane@redhat.com>
Signed-off-by: Dhaval Giani <dhaval@linux.vnet.ibm.com>
---

diff --git a/configure.in b/configure.in
index cb54d158..8271cd1a 100644
--- a/configure.in
+++ b/configure.in
@@ -76,6 +76,8 @@ AC_CONFIG_FILES([Makefile
 	src/tools/Makefile
 	src/pam/Makefile
 	scripts/Makefile
+	scripts/init.d/cgconfig
+	scripts/init.d/cgred
 	samples/Makefile
 	include/Makefile
 	doc/Makefile
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index b5270fbd..0bc7938f 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -1 +1 @@
-EXTRA_DIST = init.d/cgconfig init.d/cgred
+EXTRA_DIST = init.d/cgconfig.in init.d/cgred.in
diff --git a/scripts/init.d/cgconfig b/scripts/init.d/cgconfig.in
similarity index 96%
rename from scripts/init.d/cgconfig
rename to scripts/init.d/cgconfig.in
index 6b01d9c2..543cb9f4 100644
--- a/scripts/init.d/cgconfig
+++ b/scripts/init.d/cgconfig.in
@@ -29,7 +29,9 @@
 # Description:          This script allows us to create a default configuration
 ### END INIT INFO
 
-PATH=/bin:/usr/bin:/sbin:/usr/sbin:.
+# get correct location of binaries from configure
+prefix=@prefix@;exec_prefix=@exec_prefix@;sbindir=@sbindir@
+CGCONFIGPARSER_BIN=$sbindir/cgconfigparser
 MOUNTS_FILE=/proc/mounts
 PROC_CGROUPS_FILE=/proc/cgroups
 CGROUP_FS=cgroup
@@ -78,7 +80,7 @@ start() {
 
         if [ $? -eq 0 ]
         then
-                cgconfigparser -l $CONFIG_FILE
+                $CGCONFIGPARSER_BIN -l $CONFIG_FILE
                 retval=$?
                 if [ $retval -ne 0 ]
                 then
diff --git a/scripts/init.d/cgred b/scripts/init.d/cgred.in
similarity index 96%
rename from scripts/init.d/cgred
rename to scripts/init.d/cgred.in
index fa824dfe..f539fe74 100644
--- a/scripts/init.d/cgred
+++ b/scripts/init.d/cgred.in
@@ -32,11 +32,8 @@
 #			cgroups to classify processes
 ### END INIT INFO
 
-prefix=/usr
-exec_prefix=/usr
-bindir=/bin
-
-CGRED_BIN=${exec_prefix}/${bindir}/cgrulesengd
+prefix=@prefix@;exec_prefix=@exec_prefix@;bindir=@bindir@
+CGRED_BIN=$bindir/cgrulesengd
 
 # Sanity checks
 [ -x $CGRED_BIN ] || exit 1