Switch from /usr/lib/xen-tools/ to /usr/share/xen-tools/ to properly adhere FHS

diff --git a/Makefile b/Makefile
index 09a66844fda7f177a3db347ab0367c9becb94233..4416dc1c533e9d8ac028c09e78b7e9efc52bf775 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -147,62 +147,62 @@ install-bin:
 #
 install-hooks:
        for i in roles/* ; do if [ -f $$i ]; then cp $$i ${prefix}/etc/xen-tools/role.d; fi ; done
-       for i in ${prefix}/usr/lib/xen-tools/*.d; do if [ -L "$$i" ]; then rm -vf "$$i"; fi; done
-       mkdir -p ${prefix}/usr/lib/xen-tools/centos-4.d/
-       mkdir -p ${prefix}/usr/lib/xen-tools/centos-5.d/
-       mkdir -p ${prefix}/usr/lib/xen-tools/centos-6.d/
-       mkdir -p ${prefix}/usr/lib/xen-tools/fedora-core-6.d/
-       cp -R hooks/centos-4/*-* ${prefix}/usr/lib/xen-tools/centos-4.d
-       cp -R hooks/centos-5/*-* ${prefix}/usr/lib/xen-tools/centos-5.d
-       cp -R hooks/centos-6/*-* ${prefix}/usr/lib/xen-tools/centos-6.d
-       cp -R hooks/fedora-core-6/*-* ${prefix}/usr/lib/xen-tools/fedora-core-6.d
-       -cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-4.d
-       -cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-5.d
-       -cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-7.d
-       -cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-8.d
-       -cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-9.d
-       -cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-10.d
-       -cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-11.d
-       -cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-12.d
-       -cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-13.d
-       -cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-14.d
-       -cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-15.d
-       -cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-16.d
-       -cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-17.d
-       mkdir -p ${prefix}/usr/lib/xen-tools/debian.d/
-       cp -R hooks/debian/*-* ${prefix}/usr/lib/xen-tools/debian.d
-       -cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d sarge.d
-       -cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d etch.d
-       -cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d lenny.d
-       -cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d squeeze.d
-       -cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d wheezy.d
-       -cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d jessie.d
-       -cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d sid.d
-       -cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d testing.d
-       -cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d stable.d
-       mkdir -p ${prefix}/usr/lib/xen-tools/gentoo.d/
-       cp -R hooks/gentoo/*-* ${prefix}/usr/lib/xen-tools/gentoo.d
-       mkdir -p ${prefix}/usr/lib/xen-tools/dapper.d/
-       cp -R hooks/dapper/*-* ${prefix}/usr/lib/xen-tools/dapper.d/
-       mkdir -p ${prefix}/usr/lib/xen-tools/edgy.d/
-       cp -R hooks/edgy/*-* ${prefix}/usr/lib/xen-tools/edgy.d/
-       -cd ${prefix}/usr/lib/xen-tools/ && ln -s edgy.d feisty.d
-       -cd ${prefix}/usr/lib/xen-tools/ && ln -s edgy.d gutsy.d
-       -cd ${prefix}/usr/lib/xen-tools/ && ln -s edgy.d hardy.d
-       mkdir -p ${prefix}/usr/lib/xen-tools/intrepid.d/
-       cp -R hooks/intrepid/*-* ${prefix}/usr/lib/xen-tools/intrepid.d/
-       -cd ${prefix}/usr/lib/xen-tools/ && ln -s intrepid.d jaunty.d
-       mkdir -p ${prefix}/usr/lib/xen-tools/karmic.d/
-       cp -R hooks/karmic/*-* ${prefix}/usr/lib/xen-tools/karmic.d/
-       -cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d lucid.d
-       -cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d maverick.d
-       -cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d natty.d
-       -cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d oneiric.d
-       -cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d precise.d
-       -cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d quantal.d
-       -cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d raring.d
-       cp hooks/common.sh ${prefix}/usr/lib/xen-tools
-       cp -r hooks/common ${prefix}/usr/lib/xen-tools
+       for i in ${prefix}/usr/share/xen-tools/*.d; do if [ -L "$$i" ]; then rm -vf "$$i"; fi; done
+       mkdir -p ${prefix}/usr/share/xen-tools/centos-4.d/
+       mkdir -p ${prefix}/usr/share/xen-tools/centos-5.d/
+       mkdir -p ${prefix}/usr/share/xen-tools/centos-6.d/
+       mkdir -p ${prefix}/usr/share/xen-tools/fedora-core-6.d/
+       cp -R hooks/centos-4/*-* ${prefix}/usr/share/xen-tools/centos-4.d
+       cp -R hooks/centos-5/*-* ${prefix}/usr/share/xen-tools/centos-5.d
+       cp -R hooks/centos-6/*-* ${prefix}/usr/share/xen-tools/centos-6.d
+       cp -R hooks/fedora-core-6/*-* ${prefix}/usr/share/xen-tools/fedora-core-6.d
+       -cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-4.d
+       -cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-5.d
+       -cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-7.d
+       -cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-8.d
+       -cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-9.d
+       -cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-10.d
+       -cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-11.d
+       -cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-12.d
+       -cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-13.d
+       -cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-14.d
+       -cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-15.d
+       -cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-16.d
+       -cd ${prefix}/usr/share/xen-tools/ && ln -s fedora-core-6.d fedora-core-17.d
+       mkdir -p ${prefix}/usr/share/xen-tools/debian.d/
+       cp -R hooks/debian/*-* ${prefix}/usr/share/xen-tools/debian.d
+       -cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d sarge.d
+       -cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d etch.d
+       -cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d lenny.d
+       -cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d squeeze.d
+       -cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d wheezy.d
+       -cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d jessie.d
+       -cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d sid.d
+       -cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d testing.d
+       -cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d stable.d
+       mkdir -p ${prefix}/usr/share/xen-tools/gentoo.d/
+       cp -R hooks/gentoo/*-* ${prefix}/usr/share/xen-tools/gentoo.d
+       mkdir -p ${prefix}/usr/share/xen-tools/dapper.d/
+       cp -R hooks/dapper/*-* ${prefix}/usr/share/xen-tools/dapper.d/
+       mkdir -p ${prefix}/usr/share/xen-tools/edgy.d/
+       cp -R hooks/edgy/*-* ${prefix}/usr/share/xen-tools/edgy.d/
+       -cd ${prefix}/usr/share/xen-tools/ && ln -s edgy.d feisty.d
+       -cd ${prefix}/usr/share/xen-tools/ && ln -s edgy.d gutsy.d
+       -cd ${prefix}/usr/share/xen-tools/ && ln -s edgy.d hardy.d
+       mkdir -p ${prefix}/usr/share/xen-tools/intrepid.d/
+       cp -R hooks/intrepid/*-* ${prefix}/usr/share/xen-tools/intrepid.d/
+       -cd ${prefix}/usr/share/xen-tools/ && ln -s intrepid.d jaunty.d
+       mkdir -p ${prefix}/usr/share/xen-tools/karmic.d/
+       cp -R hooks/karmic/*-* ${prefix}/usr/share/xen-tools/karmic.d/
+       -cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d lucid.d
+       -cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d maverick.d
+       -cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d natty.d
+       -cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d oneiric.d
+       -cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d precise.d
+       -cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d quantal.d
+       -cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d raring.d
+       cp hooks/common.sh ${prefix}/usr/share/xen-tools
+       cp -r hooks/common ${prefix}/usr/share/xen-tools
 
 
 #
@@ -303,7 +303,9 @@ uninstall:
        -rm -rf ${prefix}/etc/xen-tools/skel
        -rmdir ${prefix}/etc/xen-tools/
        -rm -f ${prefix}/etc/bash_completion.d/xen-tools
+       # Maybe needed to remove older releases of xen-tools
        rm -rf ${prefix}/usr/lib/xen-tools
+       rm -rf ${prefix}/usr/share/xen-tools
        rm -f ${prefix}/usr/share/man/man8/xen-create-image.8.gz
        rm -f ${prefix}/usr/share/man/man8/xen-delete-image.8.gz
        rm -f ${prefix}/usr/share/man/man8/xen-list-images.8.gz

diff --git a/TODO.markdown b/TODO.markdown
index e5e6543dc3abbaf2979282ade71e943d4070c25a..d40f669c34db9230c89af208b31692f0160a1afb 100644 (file)
--- a/TODO.markdown
+++ b/TODO.markdown
@@ -232,6 +232,3 @@ Axel's Break-Backwards-Compatibility Wishlist
   Maybe add some `--autostart` or such.
 
 * Maybe replace findBinary with File::Which
-
-* Move /usr/lib/xen-tools/ to /usr/share/xen-tools/ as all file in
-  there are either shell or perl scripts.

diff --git a/bin/xen-create-image b/bin/xen-create-image
index b1ac0fa429e119a86c82fdf572a3b596179027c7..978f5edc0731446f609131bf13627d417263d031 100755 (executable)
--- a/bin/xen-create-image
+++ b/bin/xen-create-image
@@ -1426,9 +1426,9 @@ sub checkOption
             message => "takes a suffixed integer.\n",
         },
         distribution => {
-            check   => sub { -d "/usr/lib/xen-tools/$_[0].d" },
+            check   => sub { -d "/usr/share/xen-tools/$_[0].d" },
             message => "takes a distribution name " .
-                       "(see /usr/lib/xen-tools for valid values).\n",
+                       "(see /usr/share/xen-tools for valid values).\n",
         },
         imageType => {
             check   => qr/^sparse|full$/,

diff --git a/bin/xt-customize-image b/bin/xt-customize-image
index adc2abb59a54543c562628a311f05fba19857f2e..7fc44f1162e8cbcd864602080d22f541aa6fc85f 100755 (executable)
--- a/bin/xt-customize-image
+++ b/bin/xt-customize-image
@@ -54,7 +54,7 @@ xt-customize-image - Customize a freshly installed copy of GNU/Linux
  the --location option.
 
   For the distribution named 'foo' the scripts will be loaded and
- executed from '/usr/lib/xen-tools/foo.d'.  Each executable will
+ executed from '/usr/share/xen-tools/foo.d'.  Each executable will
  be loaded and executed in sorted order.
 
 =cut
@@ -215,7 +215,7 @@ sub checkArguments
     #  If there are no scripts then we clearly cannot
     # customise it!
     #
-    my $dir = "/usr/lib/xen-tools/" . $CONFIG{ 'dist' } . ".d";
+    my $dir = "/usr/share/xen-tools/" . $CONFIG{ 'dist' } . ".d";
 
     if ( !-d $dir )
     {
@@ -257,7 +257,7 @@ sub runDistributionHooks
     #
     #  Hook directory.
     #
-    my $hooks = "/usr/lib/xen-tools/" . $CONFIG{ 'dist' } . ".d/";
+    my $hooks = "/usr/share/xen-tools/" . $CONFIG{ 'dist' } . ".d/";
 
     #
     #  Installation prefix

diff --git a/bin/xt-install-image b/bin/xt-install-image
index 2cb29b859d70b7f295b3b8726b59357fd96f513b..d46b0e2962f711db1d60844e71983b4b7bd347c3 100755 (executable)
--- a/bin/xt-install-image
+++ b/bin/xt-install-image
@@ -387,7 +387,7 @@ sub checkArguments
     #  If there are no scripts then we clearly cannot
     # customise it!
     #
-    my $dir = "/usr/lib/xen-tools/" . $CONFIG{ 'dist' } . ".d";
+    my $dir = "/usr/share/xen-tools/" . $CONFIG{ 'dist' } . ".d";
 
     if ( !-d $dir )
     {

diff --git a/debian/NEWS b/debian/NEWS
index b0805805bfbb4d7567fbaad83061ec75c9f04b48..61223203630d2ee6f0e9cb6de5aa404c783d9123 100644 (file)
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -4,7 +4,14 @@ xen-tools (4.4~dev-1) UNRELEASED; urgency=low
     environment variable names are from now on converted to underscores
     ("_") before being exported. May affect some hook or role scripts.
 
- -- Axel Beckert <abe@debian.org>  Wed, 13 Mar 2013 23:22:20 +0100
+  * /usr/lib/xen-tools/ has been moved to /usr/share/xen-tools/ to
+    properly adhere to FHS. In case you had local scripts added to
+    /usr/lib/xen-tools/, please move them to /usr/share/xen-tools/, too
+    and then remove /usr/lib/xen-tools/ and its left-over subdirectories
+    which all should be empty at that point, i.e. "rmdir -p
+    /usr/lib/xen-tools/*" should do the trick.
+
+ -- Axel Beckert <abe@debian.org>  Fri, 05 Apr 2013 20:19:02 +0200
 
 xen-tools (4.2~rc1-1) unstable; urgency=low
 

diff --git a/debian/changelog b/debian/changelog
index 5aad773b2dce1dbb22d1f7f4b9832cf9bf032193..7fcf6dd19d68f0dc54feab040470445f48697292 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xen-tools (4.4~dev-1) UNRELEASED; urgency=low
 
   * New upstream release
     - Code deduplication to unify the xen-*-image scripts
+    - Moves /usr/lib/xen-tools/ to /usr/share/xen-tools/
     - Use http.debian.net as default Debian mirror if no mirror is given
       and xt-guess-suite-and-mirror is not used.
     - Fix symbolic link hooks/centos-6/15-setup-arch (Closes: #690299)

diff --git a/debian/dirs b/debian/dirs
index c935e65958333e740c97472018b709df9e25a7d5..d9b8b717b262897398eb5027367cd33884a12269 100644 (file)
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,4 +1,4 @@
 /etc/xen-tools
 /etc/xen-tools/role.d
 /etc/xen-tools/skel
-/usr/lib/xen-tools
\ No newline at end of file
+/usr/share/xen-tools
\ No newline at end of file

diff --git a/hooks/README b/hooks/README
index 0ac1a05ad62ac353f03fa8df3f81ad14eaa06387..4f258d6fe9e7a943684acef917e1077584518c09 100644 (file)
--- a/hooks/README
+++ b/hooks/README
@@ -19,7 +19,7 @@ hooks/
    * The installation will have a running installation of OpenSSH
 
   The subdirectories in this hooks/ directory will be installed
- to the directory /usr/lib/xen-tools/
+ to the directory /usr/share/xen-tools/
 
 Steve
 --

diff --git a/hooks/centos-5/25-setup-kernel b/hooks/centos-5/25-setup-kernel
index 52768bdef9484af4bbb3a43e9b95f3eca339be9d..c65979e3e57a28d623b6c88c878b7d36d7e5e1ae 100755 (executable)
--- a/hooks/centos-5/25-setup-kernel
+++ b/hooks/centos-5/25-setup-kernel
@@ -8,8 +8,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

diff --git a/hooks/centos-6/25-setup-kernel b/hooks/centos-6/25-setup-kernel
index 39ee3bf91ab6ac9f5fea50b530ba1fac43caac0f..2c9970398b5c7b6c36082bf6f9646a8b71609388 100755 (executable)
--- a/hooks/centos-6/25-setup-kernel
+++ b/hooks/centos-6/25-setup-kernel
@@ -8,8 +8,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

diff --git a/hooks/common/01-disable-daemons b/hooks/common/01-disable-daemons
index d12d7bde175593dc0413eb0f0177b2a7c52e785d..6e1a888245b06bf0db97d2cfd676971224eae103 100755 (executable)
--- a/hooks/common/01-disable-daemons
+++ b/hooks/common/01-disable-daemons
@@ -14,8 +14,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

diff --git a/hooks/common/05-shadowconfig-on b/hooks/common/05-shadowconfig-on
index e5bcbb4d17b377e82c4b224a31078f6702f63941..72da2b56d0e9506d015de86175a3179c81cde1aa 100755 (executable)
--- a/hooks/common/05-shadowconfig-on
+++ b/hooks/common/05-shadowconfig-on
@@ -13,8 +13,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

diff --git a/hooks/common/10-disable-tls b/hooks/common/10-disable-tls
index aa3dc7fc54e25bf09ddb293c5f3821b38641cf05..a501f961cd93de963d211a6f827eb3a8f8029a77 100755 (executable)
--- a/hooks/common/10-disable-tls
+++ b/hooks/common/10-disable-tls
@@ -14,8 +14,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

diff --git a/hooks/common/15-disable-hwclock b/hooks/common/15-disable-hwclock
index 74556acadea376e71fbfcda2ace2f77975830cce..3495e752b128e4a04ef45a5b94bb17f88b204c16 100755 (executable)
--- a/hooks/common/15-disable-hwclock
+++ b/hooks/common/15-disable-hwclock
@@ -13,8 +13,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

diff --git a/hooks/common/15-setup-arch b/hooks/common/15-setup-arch
index 569d572b8fc73c39d79266a22001cbe45f5fcbde..3fa1ec387693590fdbfae390ec6b758f700cbf15 100755 (executable)
--- a/hooks/common/15-setup-arch
+++ b/hooks/common/15-setup-arch
@@ -6,8 +6,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

diff --git a/hooks/common/20-setup-apt b/hooks/common/20-setup-apt
index 2caa2ee16b4bab98598966ef95a4cd2fa769c6bc..9b6a6cee4c4043b5934f4ca49355b596f0584fc7 100755 (executable)
--- a/hooks/common/20-setup-apt
+++ b/hooks/common/20-setup-apt
@@ -14,8 +14,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

diff --git a/hooks/common/20-setup-yum b/hooks/common/20-setup-yum
index f5410e0823f82774ea1b1da1a2f6d675da9b095e..65968cbc775796d4b42fee50725aea423c0c9f32 100755 (executable)
--- a/hooks/common/20-setup-yum
+++ b/hooks/common/20-setup-yum
@@ -13,8 +13,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

diff --git a/hooks/common/25-generate-locale b/hooks/common/25-generate-locale
index ca2b099f03e33a74682838fdacf0ff35007e2160..f03e12f812ec4e23c2dddfe8f5d86c23be433792 100755 (executable)
--- a/hooks/common/25-generate-locale
+++ b/hooks/common/25-generate-locale
@@ -13,8 +13,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

diff --git a/hooks/common/30-disable-gettys b/hooks/common/30-disable-gettys
index 821c702debed2a84bd596c4abd142893367716ba..6edc80b711eb02d2099aa02907ec0b0dfa68f037 100755 (executable)
--- a/hooks/common/30-disable-gettys
+++ b/hooks/common/30-disable-gettys
@@ -12,8 +12,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

diff --git a/hooks/common/40-setup-networking-deb b/hooks/common/40-setup-networking-deb
index b5f456fe0a7fbc852960d6d3282e5539534f9598..d8785ae56a096b61f5327916259f84d59eec0a3c 100755 (executable)
--- a/hooks/common/40-setup-networking-deb
+++ b/hooks/common/40-setup-networking-deb
@@ -13,8 +13,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

diff --git a/hooks/common/40-setup-networking-rpm b/hooks/common/40-setup-networking-rpm
index 992cd3d1e9de487e47113b7ec3b96a0b962b7298..4b1b577495e7ab40c79d884179c5742d0675274b 100755 (executable)
--- a/hooks/common/40-setup-networking-rpm
+++ b/hooks/common/40-setup-networking-rpm
@@ -13,8 +13,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

diff --git a/hooks/common/50-setup-hostname-deb b/hooks/common/50-setup-hostname-deb
index 2ad57c4f4287dd9f193bad08df20d97303c6188d..65e30d1b6e12c922362e14d02b27823c82b881b2 100755 (executable)
--- a/hooks/common/50-setup-hostname-deb
+++ b/hooks/common/50-setup-hostname-deb
@@ -15,8 +15,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

diff --git a/hooks/common/50-setup-hostname-rpm b/hooks/common/50-setup-hostname-rpm
index e2ed19f0e72689df7cf9b1101504e1ad77b3708f..5b1db9df4851903ba523c14fa71703704271e819 100755 (executable)
--- a/hooks/common/50-setup-hostname-rpm
+++ b/hooks/common/50-setup-hostname-rpm
@@ -15,8 +15,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

diff --git a/hooks/common/55-create-dev b/hooks/common/55-create-dev
index 9b3006c920f3623279c682776c19521ff552d158..88b8af2705201d4f2560024d79feed96ec3c29db 100755 (executable)
--- a/hooks/common/55-create-dev
+++ b/hooks/common/55-create-dev
@@ -14,8 +14,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

diff --git a/hooks/common/60-copy-host-files b/hooks/common/60-copy-host-files
index 8da3b937ec021cf0ed82bf57edcb8ce72a406cc2..4a772bb304c02862e5ae66549346b678557679db 100755 (executable)
--- a/hooks/common/60-copy-host-files
+++ b/hooks/common/60-copy-host-files
@@ -11,8 +11,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

diff --git a/hooks/common/65-copy-user-files b/hooks/common/65-copy-user-files
index a34fe9415adcf39d7aca960ef226c3c7c7948372..36f6b1f103ff0fe2c27e5fbafe804083875b6540 100755 (executable)
--- a/hooks/common/65-copy-user-files
+++ b/hooks/common/65-copy-user-files
@@ -11,8 +11,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

diff --git a/hooks/common/70-install-ssh-deb b/hooks/common/70-install-ssh-deb
index 378672cff7f32421c496ca20d378d7547b4e6adf..20775ea8d11762ee45610ba340288bd803223fb5 100755 (executable)
--- a/hooks/common/70-install-ssh-deb
+++ b/hooks/common/70-install-ssh-deb
@@ -15,8 +15,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

diff --git a/hooks/common/70-install-ssh-rpm b/hooks/common/70-install-ssh-rpm
index 11dccfa98a25d8ca7d052352014761fd1ac88669..9ac07db546b0077bd5bdb33340b9dec2a669c053 100755 (executable)
--- a/hooks/common/70-install-ssh-rpm
+++ b/hooks/common/70-install-ssh-rpm
@@ -13,8 +13,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

diff --git a/hooks/common/75-fixup-securetty b/hooks/common/75-fixup-securetty
index 58ab9075ef82794761eeb430073bef147cab8c53..9944c2cc4ae34f224936c1c42d702b88cb5d5863 100755 (executable)
--- a/hooks/common/75-fixup-securetty
+++ b/hooks/common/75-fixup-securetty
@@ -14,8 +14,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

diff --git a/hooks/common/80-install-modules-deb b/hooks/common/80-install-modules-deb
index 0e5d4c00370aa3cfb4f0b7ff187fcd638e95745a..2fd731c7f06488d627c8960507ff7e32b696f0d3 100755 (executable)
--- a/hooks/common/80-install-modules-deb
+++ b/hooks/common/80-install-modules-deb
@@ -19,8 +19,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

diff --git a/hooks/common/80-install-modules-rpm b/hooks/common/80-install-modules-rpm
index d6ea71818abf79dde0c036dcdc1047fc2c015a2a..d9278ad67b5e3fb3d40e828970f3d263d9533564 100755 (executable)
--- a/hooks/common/80-install-modules-rpm
+++ b/hooks/common/80-install-modules-rpm
@@ -19,8 +19,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

diff --git a/hooks/common/81-install-modules-init-tools b/hooks/common/81-install-modules-init-tools
index d5216f2015fab2754fe529204892f88a84899050..51b9ff6ca23073caad6bac00e39175e12119ba73 100755 (executable)
--- a/hooks/common/81-install-modules-init-tools
+++ b/hooks/common/81-install-modules-init-tools
@@ -13,8 +13,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

diff --git a/hooks/common/82-install-grub-legacy b/hooks/common/82-install-grub-legacy
index 41c580c7c6ef68109d42ca5c10ec100e1b378361..5f66da253aaabbba3bf37d7eb02056cce361c05a 100755 (executable)
--- a/hooks/common/82-install-grub-legacy
+++ b/hooks/common/82-install-grub-legacy
@@ -14,8 +14,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

diff --git a/hooks/common/90-make-fstab b/hooks/common/90-make-fstab
index 81e715f12a1f246102e5b0e7e5d6e73df12eeae2..1f6757ea4b4f408f78137dd53fe39fb2298c87bc 100755 (executable)
--- a/hooks/common/90-make-fstab
+++ b/hooks/common/90-make-fstab
@@ -17,8 +17,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

diff --git a/hooks/common/99-clean-image-deb b/hooks/common/99-clean-image-deb
index d36d438480de25855dba9f245e2c98d18584c7ba..9340a5504fb7ea6c4a195149779e2148cdba6c32 100755 (executable)
--- a/hooks/common/99-clean-image-deb
+++ b/hooks/common/99-clean-image-deb
@@ -13,8 +13,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

diff --git a/hooks/common/99-clean-image-rpm b/hooks/common/99-clean-image-rpm
index 5540108ffcb9d191d57d8db32a1a980ad06921cf..2ca250c7dcad834076845de95f3aef9bd4a28992 100755 (executable)
--- a/hooks/common/99-clean-image-rpm
+++ b/hooks/common/99-clean-image-rpm
@@ -12,8 +12,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

diff --git a/hooks/common/99-enable-daemons b/hooks/common/99-enable-daemons
index c1eb25a067553ed139e4a93d9c551cd531130200..b13b4f714340ed9dfa0a0365916b098c1247368d 100755 (executable)
--- a/hooks/common/99-enable-daemons
+++ b/hooks/common/99-enable-daemons
@@ -14,8 +14,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

diff --git a/hooks/debian/20-setup-apt b/hooks/debian/20-setup-apt
index dd6bbed65aeeaf3f9edb1c4d36057c4923076dea..464d4f1edff1c3c5de16a4c6b639b07b02528378 100755 (executable)
--- a/hooks/debian/20-setup-apt
+++ b/hooks/debian/20-setup-apt
@@ -14,8 +14,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

diff --git a/hooks/debian/80-install-kernel b/hooks/debian/80-install-kernel
index 6a950fef5fada9c2d55dd3bfd8120954fb110496..03a11900df85d3264707f06891224d8472fea04d 100755 (executable)
--- a/hooks/debian/80-install-kernel
+++ b/hooks/debian/80-install-kernel
@@ -15,8 +15,8 @@ prefix=$1
 #  Source our common functions
 #
 
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

diff --git a/hooks/debian/95-configure-locales b/hooks/debian/95-configure-locales
index 86d759041cdeb6f004ecb72f7d081e4a73bfcbb1..ba142ef8da534a4aae8a15cc63cac1d376ec6f46 100755 (executable)
--- a/hooks/debian/95-configure-locales
+++ b/hooks/debian/95-configure-locales
@@ -12,8 +12,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

diff --git a/hooks/edgy/80-install-kernel b/hooks/edgy/80-install-kernel
index 8dbee40aaa4b867e9d8c1b1204399f9c78d491e0..1c01911b679dce0d198dd2b30474967f7b53c6df 100755 (executable)
--- a/hooks/edgy/80-install-kernel
+++ b/hooks/edgy/80-install-kernel
@@ -15,8 +15,8 @@ prefix=$1
 #  Source our common functions
 #
 
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

diff --git a/hooks/gentoo/20-enable-su b/hooks/gentoo/20-enable-su
index 8b96c9e67522e7e9733d19fc53e3b483aa127a7c..62abe6880a9f4d0ac7e345b4c14f4156a4138b2f 100755 (executable)
--- a/hooks/gentoo/20-enable-su
+++ b/hooks/gentoo/20-enable-su
@@ -12,8 +12,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

diff --git a/hooks/gentoo/40-setup-networking b/hooks/gentoo/40-setup-networking
index b2b452dfb521ab921611509489bc73aec1a5c23a..bbb99ca4bee3d56f117080071d132bc78b2cedf2 100755 (executable)
--- a/hooks/gentoo/40-setup-networking
+++ b/hooks/gentoo/40-setup-networking
@@ -12,8 +12,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

diff --git a/hooks/gentoo/50-setup-hostname b/hooks/gentoo/50-setup-hostname
index f7212569f9e484e9e7a4a48639cd3d7d1ce01b79..16f09589f6f123d6b2b184ade0e4f7ffb63a8903 100755 (executable)
--- a/hooks/gentoo/50-setup-hostname
+++ b/hooks/gentoo/50-setup-hostname
@@ -15,8 +15,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

diff --git a/hooks/gentoo/70-install-ssh b/hooks/gentoo/70-install-ssh
index cf5c213a4ed5185fbe50ed1fb1e181a6156d869b..c8bbb4991e5402c054ee3c9116a0f7582674582b 100755 (executable)
--- a/hooks/gentoo/70-install-ssh
+++ b/hooks/gentoo/70-install-ssh
@@ -16,8 +16,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

diff --git a/hooks/intrepid/80-install-kernel b/hooks/intrepid/80-install-kernel
index eda34fcfba22f2e5c6d99158eee28733d82e7ceb..c56b74800460397d942dc2fbc1b18c375f03579b 100755 (executable)
--- a/hooks/intrepid/80-install-kernel
+++ b/hooks/intrepid/80-install-kernel
@@ -15,8 +15,8 @@ prefix=$1
 #  Source our common functions
 #
 
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

diff --git a/hooks/karmic/80-install-kernel b/hooks/karmic/80-install-kernel
index d1147c63403d2e7c65ebef2a7ef47576c200d113..f3f2f0e01b1d1a57c256858aa49c33c4a1df1f46 100755 (executable)
--- a/hooks/karmic/80-install-kernel
+++ b/hooks/karmic/80-install-kernel
@@ -15,8 +15,8 @@ prefix=$1
 #  Source our common functions
 #
 
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

diff --git a/misc/xen-tools.bash-completion b/misc/xen-tools.bash-completion
index 1a9c069d2ea872cdcc7424000d00906e804688ac..0a15e87e436768c030e3256f60bd9d722471e053 100644 (file)
--- a/misc/xen-tools.bash-completion
+++ b/misc/xen-tools.bash-completion
@@ -65,8 +65,8 @@ _xen_create_image()
     # Available distributions, by which we mean distributions which
     # we have hook scripts available.
     #
-    for i in `/bin/ls -1 /usr/lib/xen-tools/ ` ; do
-        if [ -d /usr/lib/xen-tools/${i} ]; then
+    for i in `/bin/ls -1 /usr/share/xen-tools/ ` ; do
+        if [ -d /usr/share/xen-tools/${i} ]; then
             dists="${dists} ${i/.d/}"
         fi
     done

diff --git a/misc/xen-tools.spec b/misc/xen-tools.spec
index 3fbeb6d4a60712e3b3d10a771336e435bbcd2119..a6c055d6fa0ff4c7fb7f35f5c597c5c303a49220 100644 (file)
--- a/misc/xen-tools.spec
+++ b/misc/xen-tools.spec
@@ -40,7 +40,7 @@ rm -rf $RPM_BUILD_ROOT
 /etc/bash_completion.d/*
 /usr/bin/*
 /usr/share/man/man8/*
-/usr/lib/xen-tools
+/usr/share/xen-tools
 
 
 %changelog

diff --git a/roles/builder b/roles/builder
index efbe2770434a25618a5adaf141f085aa1afd60b5..88846019a451bf41793d38791f8abf50e9e77023 100755 (executable)
--- a/roles/builder
+++ b/roles/builder
@@ -15,8 +15,8 @@ prefix=$1
 #
 #  Source our common functions - this will let us install a Debian package.
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     echo "Installation problem"
 fi

diff --git a/roles/cfengine b/roles/cfengine
index e071f532d0126740cb1224bc13f7ab2e5b2f0ef5..47b2f259bfb8f28849ec846455363d676babd5a0 100755 (executable)
--- a/roles/cfengine
+++ b/roles/cfengine
@@ -11,8 +11,8 @@ prefix=$1
 #
 #  Source our common functions - this will let us install a Debian package.
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     echo "Installation problem"
 fi

diff --git a/roles/editor b/roles/editor
index 68cefdc537fa2a23400da8fe49a07746f2222031..76e1394d93c05a8654b66b898a6b4625ea0f58ab 100755 (executable)
--- a/roles/editor
+++ b/roles/editor
@@ -30,8 +30,8 @@ source=/etc/xen-tools/sed.d/
 #
 #  Source our common functions - this will let us install a Debian package.
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     echo "Installation problem"
 fi

diff --git a/roles/gdm b/roles/gdm
index a9e9aac2033b4c66e033a4e9a1f17272e44542e8..925509211b47d1fbb75d02160424a64e4ad9b0b2 100755 (executable)
--- a/roles/gdm
+++ b/roles/gdm
@@ -15,8 +15,8 @@ prefix=$1
 #
 #  Source our common functions - this will let us install a Debian package.
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     echo "Installation problem"
 fi

diff --git a/roles/minimal b/roles/minimal
index 4f1d15910a74043ea671807e8a6c447ea5a63dd3..a52c061e9db3526dda6c38584614bf2255347c14 100755 (executable)
--- a/roles/minimal
+++ b/roles/minimal
@@ -16,8 +16,8 @@ prefix=$1
 #
 #  Source our common functions - this will let us install a Debian package.
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     echo "Installation problem"
 fi

diff --git a/roles/puppet b/roles/puppet
index d0d0ecad12e5256bf03069e4ef77aa631a320aca..be9b79ab154d7e9ea09bf0e21a9bfc38da7ce927 100755 (executable)
--- a/roles/puppet
+++ b/roles/puppet
@@ -11,8 +11,8 @@ prefix=$1
 #
 #  Source our common functions - this will let us install a Debian package.
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     echo "Installation problem"
 fi

diff --git a/roles/resolv b/roles/resolv
index fe5e41a774ae02c5bbcbc25220684d7a51c47097..e8403f685f77f125d2a7a5b52c870d0e3562d724 100755 (executable)
--- a/roles/resolv
+++ b/roles/resolv
@@ -8,8 +8,8 @@ prefix=$1
 #
 #  Source our common functions - this will let us install a Debian package.
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     echo "Installation problem"
 fi

diff --git a/roles/sudoers b/roles/sudoers
index b6b3df1d172dba6a2215a6fea8768a290ac46ffd..08a409ba5c41cdeb0ada2d71c926fae1667aba67 100755 (executable)
--- a/roles/sudoers
+++ b/roles/sudoers
@@ -8,8 +8,8 @@ prefix=$1
 #
 #  Source our common functions - this will let us install a Debian package.
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     echo "Installation problem"
 fi

diff --git a/roles/tmpfs b/roles/tmpfs
index fc51625a38578b3238b46da93540267f598156b9..74f9fc69866c1b6486fe006e22183c83e620a448 100755 (executable)
--- a/roles/tmpfs
+++ b/roles/tmpfs
@@ -12,8 +12,8 @@ prefix=$1
 #
 #  Source our common functions
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     . ./hooks/common.sh
 fi

diff --git a/roles/udev b/roles/udev
index abb39ad4d85aaf9a0f77c558a88b3c6f74a38ca7..6e2be833d2251d32de971714b26dae75079d3a8e 100755 (executable)
--- a/roles/udev
+++ b/roles/udev
@@ -15,8 +15,8 @@ prefix=$1
 #
 #  Source our common functions - this will let us install a Debian package.
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     echo "Installation problem"
 fi

diff --git a/roles/xdm b/roles/xdm
index f51bf7274c343284aee3df19d18ea0f47a238fda..a57eec8f6fd81c4f65791942ff0bcc6dbf4fb4b4 100755 (executable)
--- a/roles/xdm
+++ b/roles/xdm
@@ -15,8 +15,8 @@ prefix=$1
 #
 #  Source our common functions - this will let us install a Debian package.
 #
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
+if [ -e /usr/share/xen-tools/common.sh ]; then
+    . /usr/share/xen-tools/common.sh
 else
     echo "Installation problem"
 fi