SOURCES: openvcpd-DESTDIR.patch - fix environment variables

baggins baggins at pld-linux.org
Sat Sep 22 22:30:53 CEST 2007


Author: baggins                      Date: Sat Sep 22 20:30:53 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fix environment variables

---- Files affected:
SOURCES:
   openvcpd-DESTDIR.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/openvcpd-DESTDIR.patch
diff -u SOURCES/openvcpd-DESTDIR.patch:1.1 SOURCES/openvcpd-DESTDIR.patch:1.2
--- SOURCES/openvcpd-DESTDIR.patch:1.1	Sat Sep 22 01:37:06 2007
+++ SOURCES/openvcpd-DESTDIR.patch	Sat Sep 22 22:30:47 2007
@@ -21,10 +21,10 @@
 +	mkdir -p $(DESTDIR)$(datadir)/openvcpd
 +	cp openvcpd $(DESTDIR)$(bindir)/openvcpd
 +	cp parse_ipfmlogs $(DESTDIR)$(bindir)/parse_ipfmlogs
-+	cfgdir=`vserver-info 2>&1 | grep 'cfg-Directory:' | awk -F: '{ print $$2 }' | cut -c2-`;
-+	rootdir=`vserver-info 2>&1 | grep 'vserver-Rootdir:' | awk -F: '{ print $$2 }' | cut -c2-`;
-+	rundir=`vserver-info 2>&1 | grep 'pkgstate-Directory:' | awk -F: '{ print $$2 }' | cut -c2-`;
-+	echo "CONF: $$cfgdir, $$rootdir, $$rundir";
++	cfgdir=`vserver-info 2>&1 | grep 'cfg-Directory:' | awk -F: '{ print $$2 }' | cut -c2-`; \
++	rootdir=`vserver-info 2>&1 | grep 'vserver-Rootdir:' | awk -F: '{ print $$2 }' | cut -c2-`; \
++	rundir=`vserver-info 2>&1 | grep 'pkgstate-Directory:' | awk -F: '{ print $$2 }' | cut -c2-`; \
++	echo "CONF: $$cfgdir, $$rootdir, $$rundir"; \
 +	cat openvcpd.conf | sed s#'CONFIGDIR'#$$cfgdir# | sed s#'ROOTDIR'#$$rootdir# | sed s#'RUNDIR'#$$rundir# > $(DESTDIR)$(sysconfdir)/openvcpd.conf;
  
  uninstall:
================================================================

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



More information about the pld-cvs-commit mailing list