2006-06-15 07:42:59 by steve

Source common.sh from the parent directory if the global installation isn't found. This allows "make test" to succeed *before* the tools are installed.
2026-01-15 07:53:03 +00:00 · 2006-06-15 07:42:59 +00:00 · 2006-06-15 07:42:59 +00:00 · c1e4d3531b
commit c1e4d3531b
parent 28eb33e98d
23 changed files with 46 additions and 0 deletions
--- a/hooks/centos4/10-disable-tls
+++ b/hooks/centos4/10-disable-tls
@ -16,6 +16,8 @@ prefix=$1
 #
 if [ -e /usr/lib/xen-tools/common.sh ]; then
    . /usr/lib/xen-tools/common.sh
+else
+    . ../common.sh
 fi


--- a/hooks/centos4/20-setup-yum
+++ b/hooks/centos4/20-setup-yum
@ -15,6 +15,8 @@ prefix=$1
 #
 if [ -e /usr/lib/xen-tools/common.sh ]; then
    . /usr/lib/xen-tools/common.sh
+else
+    . ../common.sh
 fi


--- a/hooks/centos4/30-fix-inittab
+++ b/hooks/centos4/30-fix-inittab
@ -18,6 +18,8 @@ prefix=$1
 #
 if [ -e /usr/lib/xen-tools/common.sh ]; then
    . /usr/lib/xen-tools/common.sh
+else
+    . ../common.sh
 fi


--- a/hooks/centos4/40-setup-networking
+++ b/hooks/centos4/40-setup-networking
@ -15,6 +15,8 @@ prefix=$1
 #
 if [ -e /usr/lib/xen-tools/common.sh ]; then
    . /usr/lib/xen-tools/common.sh
+else
+    . ../common.sh
 fi


--- a/hooks/centos4/50-setup-hostname
+++ b/hooks/centos4/50-setup-hostname
@ -17,6 +17,8 @@ prefix=$1
 #
 if [ -e /usr/lib/xen-tools/common.sh ]; then
    . /usr/lib/xen-tools/common.sh
+else
+    . ../common.sh
 fi


--- a/hooks/centos4/55-create-dev
+++ b/hooks/centos4/55-create-dev
@ -17,6 +17,8 @@ prefix=$1
 #
 if [ -e /usr/lib/xen-tools/common.sh ]; then
    . /usr/lib/xen-tools/common.sh
+else
+    . ../common.sh
 fi


--- a/hooks/centos4/65-copy-user-files
+++ b/hooks/centos4/65-copy-user-files
@ -13,6 +13,8 @@ prefix=$1
 #
 if [ -e /usr/lib/xen-tools/common.sh ]; then
    . /usr/lib/xen-tools/common.sh
+else
+    . ../common.sh
 fi


--- a/hooks/centos4/70-install-ssh
+++ b/hooks/centos4/70-install-ssh
@ -15,6 +15,8 @@ prefix=$1
 #
 if [ -e /usr/lib/xen-tools/common.sh ]; then
    . /usr/lib/xen-tools/common.sh
+else
+    . ../common.sh
 fi


--- a/hooks/centos4/80-install-modules
+++ b/hooks/centos4/80-install-modules
@ -16,6 +16,8 @@ prefix=$1
 #
 if [ -e /usr/lib/xen-tools/common.sh ]; then
    . /usr/lib/xen-tools/common.sh
+else
+    . ../common.sh
 fi


--- a/hooks/centos4/90-make-fstab
+++ b/hooks/centos4/90-make-fstab
@ -19,6 +19,8 @@ prefix=$1
 #
 if [ -e /usr/lib/xen-tools/common.sh ]; then
    . /usr/lib/xen-tools/common.sh
+else
+    . ../common.sh
 fi


--- a/hooks/centos4/99-clean-image
+++ b/hooks/centos4/99-clean-image
@ -14,6 +14,8 @@ prefix=$1
 #
 if [ -e /usr/lib/xen-tools/common.sh ]; then
    . /usr/lib/xen-tools/common.sh
+else
+    . ../common.sh
 fi


--- a/hooks/debian/10-disable-tls
+++ b/hooks/debian/10-disable-tls
@ -14,6 +14,8 @@ prefix=$1
 #
 if [ -e /usr/lib/xen-tools/common.sh ]; then
    . /usr/lib/xen-tools/common.sh
+else
+    . ../common.sh
 fi


--- a/hooks/debian/15-disable-hwclock
+++ b/hooks/debian/15-disable-hwclock
@ -15,6 +15,8 @@ prefix=$1
 #
 if [ -e /usr/lib/xen-tools/common.sh ]; then
    . /usr/lib/xen-tools/common.sh
+else
+    . ../common.sh
 fi


--- a/hooks/debian/20-setup-apt
+++ b/hooks/debian/20-setup-apt
@ -15,6 +15,8 @@ prefix=$1
 #
 if [ -e /usr/lib/xen-tools/common.sh ]; then
    . /usr/lib/xen-tools/common.sh
+else
+    . ../common.sh
 fi


--- a/hooks/debian/30-fix-inittab
+++ b/hooks/debian/30-fix-inittab
@ -18,6 +18,8 @@ prefix=$1
 #
 if [ -e /usr/lib/xen-tools/common.sh ]; then
    . /usr/lib/xen-tools/common.sh
+else
+    . ../common.sh
 fi


--- a/hooks/debian/40-setup-networking
+++ b/hooks/debian/40-setup-networking
@ -15,6 +15,8 @@ prefix=$1
 #
 if [ -e /usr/lib/xen-tools/common.sh ]; then
    . /usr/lib/xen-tools/common.sh
+else
+    . ../common.sh
 fi


--- a/hooks/debian/50-setup-hostname
+++ b/hooks/debian/50-setup-hostname
@ -17,6 +17,8 @@ prefix=$1
 #
 if [ -e /usr/lib/xen-tools/common.sh ]; then
    . /usr/lib/xen-tools/common.sh
+else
+    . ../common.sh
 fi


--- a/hooks/debian/55-create-dev
+++ b/hooks/debian/55-create-dev
@ -16,6 +16,8 @@ prefix=$1
 #
 if [ -e /usr/lib/xen-tools/common.sh ]; then
    . /usr/lib/xen-tools/common.sh
+else
+    . ../common.sh
 fi


--- a/hooks/debian/65-copy-user-files
+++ b/hooks/debian/65-copy-user-files
@ -13,6 +13,8 @@ prefix=$1
 #
 if [ -e /usr/lib/xen-tools/common.sh ]; then
    . /usr/lib/xen-tools/common.sh
+else
+    . ../common.sh
 fi


--- a/hooks/debian/70-install-ssh
+++ b/hooks/debian/70-install-ssh
@ -18,6 +18,8 @@ prefix=$1
 #
 if [ -e /usr/lib/xen-tools/common.sh ]; then
    . /usr/lib/xen-tools/common.sh
+else
+    . ../common.sh
 fi


--- a/hooks/debian/80-install-modules
+++ b/hooks/debian/80-install-modules
@ -21,6 +21,8 @@ prefix=$1
 #
 if [ -e /usr/lib/xen-tools/common.sh ]; then
    . /usr/lib/xen-tools/common.sh
+else
+    . ../common.sh
 fi


--- a/hooks/debian/90-make-fstab
+++ b/hooks/debian/90-make-fstab
@ -19,6 +19,8 @@ prefix=$1
 #
 if [ -e /usr/lib/xen-tools/common.sh ]; then
    . /usr/lib/xen-tools/common.sh
+else
+    . ../common.sh
 fi


--- a/hooks/debian/99-clean-image
+++ b/hooks/debian/99-clean-image
@ -15,6 +15,8 @@ prefix=$1
 #
 if [ -e /usr/lib/xen-tools/common.sh ]; then
    . /usr/lib/xen-tools/common.sh
+else
+    . ../common.sh
 fi