From c1e4d3531bf407e44644dfacfcdab96a435cef0d Mon Sep 17 00:00:00 2001 From: steve Date: Thu, 15 Jun 2006 07:42:59 +0000 Subject: [PATCH] 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. --- hooks/centos4/10-disable-tls | 2 ++ hooks/centos4/20-setup-yum | 2 ++ hooks/centos4/30-fix-inittab | 2 ++ hooks/centos4/40-setup-networking | 2 ++ hooks/centos4/50-setup-hostname | 2 ++ hooks/centos4/55-create-dev | 2 ++ hooks/centos4/65-copy-user-files | 2 ++ hooks/centos4/70-install-ssh | 2 ++ hooks/centos4/80-install-modules | 2 ++ hooks/centos4/90-make-fstab | 2 ++ hooks/centos4/99-clean-image | 2 ++ hooks/debian/10-disable-tls | 2 ++ hooks/debian/15-disable-hwclock | 2 ++ hooks/debian/20-setup-apt | 2 ++ hooks/debian/30-fix-inittab | 2 ++ hooks/debian/40-setup-networking | 2 ++ hooks/debian/50-setup-hostname | 2 ++ hooks/debian/55-create-dev | 2 ++ hooks/debian/65-copy-user-files | 2 ++ hooks/debian/70-install-ssh | 2 ++ hooks/debian/80-install-modules | 2 ++ hooks/debian/90-make-fstab | 2 ++ hooks/debian/99-clean-image | 2 ++ 23 files changed, 46 insertions(+) diff --git a/hooks/centos4/10-disable-tls b/hooks/centos4/10-disable-tls index 54aff6d..f15105c 100755 --- 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 diff --git a/hooks/centos4/20-setup-yum b/hooks/centos4/20-setup-yum index 13a75b5..94fb5fd 100755 --- 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 diff --git a/hooks/centos4/30-fix-inittab b/hooks/centos4/30-fix-inittab index 4d72040..ebd62e8 100755 --- 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 diff --git a/hooks/centos4/40-setup-networking b/hooks/centos4/40-setup-networking index a8c02ee..507501a 100755 --- 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 diff --git a/hooks/centos4/50-setup-hostname b/hooks/centos4/50-setup-hostname index fd324bb..ea1dfea 100755 --- 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 diff --git a/hooks/centos4/55-create-dev b/hooks/centos4/55-create-dev index 0156bf2..18ab281 100755 --- 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 diff --git a/hooks/centos4/65-copy-user-files b/hooks/centos4/65-copy-user-files index 496bc66..9fd4fb2 100755 --- 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 diff --git a/hooks/centos4/70-install-ssh b/hooks/centos4/70-install-ssh index b7fa030..6f8bba6 100755 --- 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 diff --git a/hooks/centos4/80-install-modules b/hooks/centos4/80-install-modules index 00b97fd..caf37c3 100755 --- 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 diff --git a/hooks/centos4/90-make-fstab b/hooks/centos4/90-make-fstab index 31b2747..86e3be2 100755 --- 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 diff --git a/hooks/centos4/99-clean-image b/hooks/centos4/99-clean-image index 9bc0ecf..bae3fd3 100755 --- 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 diff --git a/hooks/debian/10-disable-tls b/hooks/debian/10-disable-tls index ab8b352..f11a8c4 100755 --- 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 diff --git a/hooks/debian/15-disable-hwclock b/hooks/debian/15-disable-hwclock index 5dcf04b..965d51e 100755 --- 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 diff --git a/hooks/debian/20-setup-apt b/hooks/debian/20-setup-apt index 1d0b8b8..18961b0 100755 --- 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 diff --git a/hooks/debian/30-fix-inittab b/hooks/debian/30-fix-inittab index 4d72040..ebd62e8 100755 --- 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 diff --git a/hooks/debian/40-setup-networking b/hooks/debian/40-setup-networking index 05bbd48..74517b6 100755 --- 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 diff --git a/hooks/debian/50-setup-hostname b/hooks/debian/50-setup-hostname index 5f6a4fd..95acbb6 100755 --- 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 diff --git a/hooks/debian/55-create-dev b/hooks/debian/55-create-dev index 5c7c420..eb28fa5 100755 --- 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 diff --git a/hooks/debian/65-copy-user-files b/hooks/debian/65-copy-user-files index 496bc66..9fd4fb2 100755 --- 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 diff --git a/hooks/debian/70-install-ssh b/hooks/debian/70-install-ssh index f5daa0a..5152f27 100755 --- 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 diff --git a/hooks/debian/80-install-modules b/hooks/debian/80-install-modules index 10a6b4e..28fe7b0 100755 --- 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 diff --git a/hooks/debian/90-make-fstab b/hooks/debian/90-make-fstab index d6dab2f..ba02167 100755 --- 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 diff --git a/hooks/debian/99-clean-image b/hooks/debian/99-clean-image index 58c634b..49cba08 100755 --- 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