- rel 2; more datadir fixes

diff --git a/rebootmgr.init b/rebootmgr.init
index 5a7ae5e72ff67b87517e957beada22d4bd33a70b..5936e0c194c54b78ef47afc988810f7c8b28562d 100644 (file)
--- a/rebootmgr.init
+++ b/rebootmgr.init
@@ -10,7 +10,7 @@
 
 . /etc/init.d/functions
 
-[ -n "$UTIL_VSERVER_VARS" ] || UTIL_VSERVER_VARS=/usr/lib/util-vserver/util-vserver-vars
+[ -n "$UTIL_VSERVER_VARS" ] || UTIL_VSERVER_VARS=/usr/share/util-vserver/util-vserver-vars
 if [ ! -e "$UTIL_VSERVER_VARS" ] ; then
        echo "Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2
        exit 1

diff --git a/util-vserver-pld.patch b/util-vserver-pld.patch
index 8977801d9c12482563a69932aaf0a928a9388c41..44c3c04a139769f5d9be976e35e5d8c23dd372b5 100644 (file)
--- a/util-vserver-pld.patch
+++ b/util-vserver-pld.patch
@@ -586,7 +586,7 @@
 +# along with this program; if not, write to the Free Software
 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 +
-+: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars}
++: ${UTIL_VSERVER_VARS:=/usr/share/util-vserver/util-vserver-vars}
 +test -e "$UTIL_VSERVER_VARS" || {
 +    echo $"Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2
 +    exit 1
@@ -665,7 +665,7 @@
 +
 +set -e
 +
-+: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars}
++: ${UTIL_VSERVER_VARS:=/usr/share/util-vserver/util-vserver-vars}
 +test -e "$UTIL_VSERVER_VARS" || {
 +    echo $"Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2
 +    exit 1

diff --git a/util-vserver-rpm5.patch b/util-vserver-rpm5.patch
index 7f0cf066c5562c85e3a9197eb417bd30288c3ea1..5ac07a29cbcc85061a66c8a9d83ea42f9d6664e7 100644 (file)
--- a/util-vserver-rpm5.patch
+++ b/util-vserver-rpm5.patch
@@ -33,7 +33,7 @@
 +
 +set -e
 +
-+: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars}
++: ${UTIL_VSERVER_VARS:=/usr/share/util-vserver/util-vserver-vars}
 +test -e "$UTIL_VSERVER_VARS" || {
 +    echo $"Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2
 +    exit 1

diff --git a/util-vserver-vsysvwrapper.patch b/util-vserver-vsysvwrapper.patch
index b75af205e9e47d68caf3a26498c4906be631e84c..d81a279954f80a0385fc77bea65422cc6d2d3947 100644 (file)
--- a/util-vserver-vsysvwrapper.patch
+++ b/util-vserver-vsysvwrapper.patch
@@ -10,7 +10,7 @@
 -    exit 1
 -}
 +
-+[ -n "$UTIL_VSERVER_VARS" ] || UTIL_VSERVER_VARS=/usr/lib/util-vserver/util-vserver-vars
++[ -n "$UTIL_VSERVER_VARS" ] || UTIL_VSERVER_VARS=/usr/share/util-vserver/util-vserver-vars
 +if [ ! -e "$UTIL_VSERVER_VARS" ] ; then
 +      echo "Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2
 +      exit 1

diff --git a/util-vserver.init b/util-vserver.init
index e0a60609b976607195c0492fd44fc9a55385c73b..3f7e025904d4f775648d4c8ac085d9cf69a62e78 100644 (file)
--- a/util-vserver.init
+++ b/util-vserver.init
@@ -17,7 +17,7 @@ fi
 # Source function library
 . /etc/rc.d/init.d/functions
 
-[ -n "$UTIL_VSERVER_VARS" ] || UTIL_VSERVER_VARS=/usr/lib/util-vserver/util-vserver-vars
+[ -n "$UTIL_VSERVER_VARS" ] || UTIL_VSERVER_VARS=/usr/share/util-vserver/util-vserver-vars
 if [ ! -e "$UTIL_VSERVER_VARS" ] ; then
        echo "Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2
        exit 1

diff --git a/util-vserver.spec b/util-vserver.spec
index b43db3b26d75c22643fad5bad102ad623854ac8f..1129bbb6ed16abe99bda4697bae95e2a588f5a78 100644 (file)
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -19,7 +19,7 @@
 %define                reqdb_ver       5.2
 %define                reqdb_pkg       db%{reqdb_ver}
 %define                snap    pre3054
-%define                rel     1
+%define                rel     2
 Summary:       Linux virtual server utilities
 Summary(pl.UTF-8):     Narzędzia dla linuksowych serwerów wirtualnych
 Name:          util-vserver
@@ -517,15 +517,11 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.defaults/cgroup/per-ss
 
 chmod -R +rX $RPM_BUILD_ROOT%{_datadir}/%{name}/distributions/*
 
-sed 's|%{_usrlib}/util-vserver|%{_libdir}/%{name}|g' %{SOURCE1} > \
-       $RPM_BUILD_ROOT/etc/rc.d/init.d/vprocunhide
-sed 's|%{_usrlib}/util-vserver|%{_libdir}/%{name}|g' %{SOURCE2} > \
-       $RPM_BUILD_ROOT/etc/rc.d/init.d/vservers
-sed 's|%{_usrlib}/util-vserver|%{_libdir}/%{name}|g' %{SOURCE15} > \
-       $RPM_BUILD_ROOT/etc/rc.d/init.d/util-vserver
-sed 's|%{_usrlib}/util-vserver|%{_libdir}/%{name}|g' %{SOURCE5} > \
-       $RPM_BUILD_ROOT/etc/sysconfig/vservers
-sed 's|%{_usrlib}/util-vserver|%{_libdir}/%{name}|g' gentoo/bash-wrapper > \
+cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/vprocunhide
+cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/vservers
+cp -p %{SOURCE15} $RPM_BUILD_ROOT/etc/rc.d/init.d/util-vserver
+cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/vservers
+sed 's|%{_usrlib}/util-vserver|%{_datadir}/%{name}|g' gentoo/bash-wrapper > \
        $RPM_BUILD_ROOT%{_libdir}/%{name}/bash-wrapper
 
 %if %{with legacy}
@@ -540,10 +536,8 @@ for i in $RPM_BUILD_ROOT/etc/rc.d/init.d/v_* ; do
 EOF
 done
 
-sed 's|%{_usrlib}/util-vserver|%{_libdir}/%{name}|g' %{SOURCE3} > \
-       $RPM_BUILD_ROOT/etc/rc.d/init.d/vservers-legacy
-sed 's|%{_usrlib}/util-vserver|%{_libdir}/%{name}|g' %{SOURCE4} > \
-       $RPM_BUILD_ROOT/etc/rc.d/init.d/rebootmgr
+cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/vservers-legacy
+cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/rebootmgr
 install -p %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/vservers-legacy
 %else
 rm $RPM_BUILD_ROOT/etc/rc.d/init.d/rebootmgr

diff --git a/vprocunhide.init b/vprocunhide.init
index 4bc80cef194ed898ff57dfd98f0835861a5b51f9..423a15db68af401d0f800852dfe76fb52be844a6 100644 (file)
--- a/vprocunhide.init
+++ b/vprocunhide.init
@@ -19,7 +19,7 @@ fi
 # Source function library.
 . /etc/rc.d/init.d/functions
 
-[ -n "$UTIL_VSERVER_VARS" ] || UTIL_VSERVER_VARS=/usr/lib/util-vserver/util-vserver-vars
+[ -n "$UTIL_VSERVER_VARS" ] || UTIL_VSERVER_VARS=/usr/share/util-vserver/util-vserver-vars
 if [ ! -e "$UTIL_VSERVER_VARS" ] ; then
        echo "Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2
        exit 1

diff --git a/vservers-legacy.init b/vservers-legacy.init
index 6724107671e0363af5c350f181a077c29d0ce388..c6e96b995956d3e402075641c1d1be347b268cda 100644 (file)
--- a/vservers-legacy.init
+++ b/vservers-legacy.init
@@ -9,7 +9,7 @@
 
 . /etc/sysconfig/vservers-legacy
 
-[ -n "$UTIL_VSERVER_VARS" ] || UTIL_VSERVER_VARS=/usr/lib/util-vserver/util-vserver-vars
+[ -n "$UTIL_VSERVER_VARS" ] || UTIL_VSERVER_VARS=/usr/share/util-vserver/util-vserver-vars
 if [ ! -e "$UTIL_VSERVER_VARS" ] ; then
        echo "Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2
        exit 1

diff --git a/vservers.init b/vservers.init
index 7826c864baffcc2aeecd4d071820f19542923ed5..6908c58e43f533bbf65cc165c9ab562f83f06f9f 100644 (file)
--- a/vservers.init
+++ b/vservers.init
@@ -14,7 +14,7 @@
 # Source function library
 . /etc/rc.d/init.d/functions
 
-[ -n "$UTIL_VSERVER_VARS" ] || UTIL_VSERVER_VARS=/usr/lib/util-vserver/util-vserver-vars
+[ -n "$UTIL_VSERVER_VARS" ] || UTIL_VSERVER_VARS=/usr/share/util-vserver/util-vserver-vars
 if [ ! -e "$UTIL_VSERVER_VARS" ] ; then
        echo "Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2
        exit 1

diff --git a/vservers.sysconfig b/vservers.sysconfig
index 0720dc2fe4744c02dd4b2f60a52f7e41bb8989de..64be5f00ec65dbb65747ee899a899ac377b08a35 100644 (file)
--- a/vservers.sysconfig
+++ b/vservers.sysconfig
@@ -33,4 +33,4 @@ MARKS="default"
 # The location of util-vserver-vars
 # This file contains variables to util-vserver scripts used within the
 # init script. Change at your own risk.
-#UTIL_VSERVER_VARS=/usr/lib/util-vserver/util-vserver-vars
+#UTIL_VSERVER_VARS=/usr/share/util-vserver/util-vserver-vars