r2467 - trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian

[Sven Luther]

Author: luther
Date: 2005-02-09 10:21:40 +0100 (Wed, 09 Feb 2005)
New Revision: 2467

Modified:
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/mkvmlinuz.postinst
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/mkvmlinuz.templates
Log:
Added more complete logic to the debconf stuff, still doesn't get shown though.


Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/mkvmlinuz.postinst
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/mkvmlinuz.postinst	2005-02-09 03:14:10 UTC (rev 2466)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/mkvmlinuz.postinst	2005-02-09 09:21:40 UTC (rev 2467)
@@ -7,7 +7,7 @@
 case $(grep ^machine /proc/cpuinfo) in
     *PReP*Blackhawk*) arch=ppcbug ;;
     *PReP*) arch=prep ;;
-    "*CHRP Pegasos*") arch=chrp_pegasos ;;
+    *CHRP*Pegasos*) arch=chrp_pegasos ;;
     *CHRP*) arch=chrp ;;
     *Amiga*) arch=apus ;;
     *iSeries*) arch=iseries ;;
@@ -21,29 +21,41 @@
 	;;
 esac
 
-# arches supported by yaboot :
+# List of bootloader per subarch.
 case $arch in
-    chrp|pmac_newworld) bootloaders="yaboot mkvmlinuz" ;;
-    pmac_oldworld) bootloaders="quik mkvmlinuz" ;;
-    chrp_pegasos) bootloaders="bogus mkvmlinuz" ;;
-    *) bootloaders="mkvmlinuz" ;;
+    chrp|pmac_newworld) bootloaders="yaboot, mkvmlinuz" ;;
+    pmac_oldworld) bootloaders="quik, mkvmlinuz" ;;
+    ppcbug|prep|chrp_pegasos|iseries) bootloaders="mkvmlinuz"
+    *) bootloaders="unknown" ;;
 esac
 
 # If there is more than one bootloader present, ask the user
 # at medium priority
 
 db_subst kernel-image-powerpc/bootloaders choices "$bootloaders"
-db_subst kernel-image-powerpc/bootloaders default "${bootloaders%% *}"
+db_subst kernel-image-powerpc/bootloaders default "${bootloaders%, *}"
 db_input medium kernel-image-powerpc/bootloaders || true
 db_go || true
 
 db_get kernel-image-powerpc/bootloaders
 bootloader="$RET"
 
-echo "User choosed $bootloader as bootloader"
-
 # If mkvmlinuz is chosen, we invoke it
-if [ "$bootloader" == "mkvmlinuz" ]; then
-    echo /usr/sbin/mkvmlinux $1 $2
-
-fi
+case "$bootloader" in
+    yaboot)
+	db_input medium kernel-image-powerpc/bootloaders-yaboot || true
+	db_go
+	;;
+    quik)
+	db_input medium kernel-image-powerpc/bootloaders-quik || true
+	db_go
+	;;
+    mkvmlinuz)
+    	/usr/sbin/mkvmlinux $1 $2
+	;;
+    *)
+	db_subst kernel-image-powerpc/bootloaders-unknown "$arch"
+	db_input medium kernel-image-powerpc/bootloaders-unknown || true
+	db_go
+	;;
+esac

Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/mkvmlinuz.templates
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/mkvmlinuz.templates	2005-02-09 03:14:10 UTC (rev 2466)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/mkvmlinuz.templates	2005-02-09 09:21:40 UTC (rev 2467)
@@ -2,6 +2,22 @@
 Type: select
 Choices: ${choices}
 Default: ${default}
-Description: Select your bootloader
+Description: select your bootloader
  Your PowerPC arch supports more than one bootloader, 
  please chose the one you want to use.
+
+Template: kernel-image-powerpc/bootloaders-yaboot
+Type: note
+Description: please call yaboot by hand
+ No logic yet to call yaboot directly, please do it by hand.
+
+Template: kernel-image-powerpc/bootloaders-quik
+Type: note
+Description: please call quik by hand
+ No logic yet to call quik directly, please do it by hand.
+
+Template: kernel-image-powerpc/bootloaders-unknown
+Type: note
+Description: no bootloader method for ${arch}
+ No known bootloader method for PowerPC subarch ${arch}.
+