From 735fdba26356f49cbae44445d73a4054c2447a5d Mon Sep 17 00:00:00 2001
From: LaMont Jones <lamont@mib>
Date: Wed, 26 Sep 2007 13:44:32 -0600
Subject: [PATCH] drop the -smp from ia64 kernel names, since the SMP/non-SMP
 packages merged

---
 livecd.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/livecd.sh b/livecd.sh
index 419de831..c3336c3b 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -214,7 +214,7 @@ Flags: seen
 	    LIVELIST="$tocdlive casper"
     esac
 
-    dpkg -l livecd-rootfs	# get our version # in the log.
+    dpkg -l livecd-rootfs || true	# get our version # in the log.
     if [ "$FS" != "ubuntu-lpia" ]; then
         debootstrap --components=$(echo $COMP | sed 's/ /,/g') $STE $ROOT $MIRROR
     else
@@ -282,7 +282,7 @@ link_in_boot = $link_in_boot
 	    esac;;
 
 	# and the bastard stepchildren
-	ia64)		LIST="$LIST linux-itanium-smp linux-mckinley-smp";;
+	ia64)		LIST="$LIST linux-itanium linux-mckinley";;
 	hppa)		LIST="$LIST linux-hppa32 linux-hppa64";;
 	sparc*)		LIST="$LIST linux-sparc64";;
 	*)		echo "Unknown architecture: no kernel."; exit 1;;