From mboxrd@z Thu Jan  1 00:00:00 1970
From: Aron Griffis <aron@hp.com>
Subject: [PATCH] pygrub: ia64 doesn't use /usr/lib64
Date: Wed, 2 May 2007 15:02:22 -0400
Message-ID: <20070502190220.GA22251@fc.hp.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Return-path: <xen-devel-bounces@lists.xensource.com>
Content-Disposition: inline
List-Unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: keir@xensource.com
Cc: xen-devel@lists.xensource.com, xen-ia64-devel@lists.xensource.com
List-Id: xen-devel@lists.xenproject.org

Keir,

Please apply to 3.1.0

ia64 doesn't use /usr/lib64 on any distribution.  When it's present,
it's a symlink to /usr/lib

Signed-off-by: Aron Griffis <aron@hp.com>

diff -r 53b9883bbcc3 -r 13af73f1b429 tools/libfsimage/common/fsimage_plugin.c
--- a/tools/libfsimage/common/fsimage_plugin.c	Fri Apr 27 14:45:06 2007 +0100
+++ b/tools/libfsimage/common/fsimage_plugin.c	Wed May 02 14:47:03 2007 -0400
@@ -137,6 +137,9 @@ static int load_plugins(void)
 
 	if (sizeof(void *) == 8)
 		isadir = "64/";
+#elif defined(__ia64__)
+	if (fsdir == NULL)
+		fsdir = "/usr/lib/fs";
 #else
 	if (fsdir == NULL) {
 		if (sizeof(void *) == 8)