On Fri, 2008-10-31 at 17:11 +0100, Guido Günther wrote:
> Yes, this looks just right!
This is functionally identical but is more self-documenting...
diff --git a/packages/base-installer/debian/changelog
b/packages/base-installer/debian/changelog
index 59404b5..5fd1b4c 100644
--- a/packages/base-installer/debian/changelog
+++ b/packages/base-installer/debian/changelog
@@ -1,3 +1,12 @@
+base-installer (1.99) UNRELEASED; urgency=low
+
+ [ Ian Campbell ]
+ * i386: Use -686 flavour for CentaurHauls "Esther" (model 10) processors.
+ Only the "Nehemiah" (model 9) processors do not support long NOP
+ instructions. Closes: #504095
+
+ --
+
base-installer (1.98) unstable; urgency=low
[ Colin Watson ]
diff --git a/packages/base-installer/kernel/i386.sh
b/packages/base-installer/kernel/i386.sh
index cba6d9b..1b56a73 100644
--- a/packages/base-installer/kernel/i386.sh
+++ b/packages/base-installer/kernel/i386.sh
@@ -36,10 +36,21 @@ arch_get_kernel_flavour () {
esac
;;
" CentaurHauls")
- # x86 VIA Nehemiah CentaurHauls does not boot with -686
- # since 2.6.22+ since they lack long NOP instructions.
- # See: http://lkml.org/lkml/2008/7/22/263
- echo 486 ;;
+ case "$FAMILY" in
+ " 6")
+ case "$MODEL" in
+ # x86 VIA Nehemiah CentaurHauls does not boot with
-686
+ # since 2.6.22+ since they lack long NOP
instructions.
+ # See: http://lkml.org/lkml/2008/7/22/263
+ " 9") echo 486 ;;
+ " 10") echo 686$BIGMEM ;;
+ *) echo 486 ;;
+ esac
+ ;;
+ *)
+ echo 486 ;;
+ esac
+ ;;
*)
echo 486 ;;
esac
--
Ian Campbell
Current Noise: Deep Purple - Shield
When a person goes on a diet, the first thing he loses is his temper.
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
