Re: m68k boot-floppies for woody

[Richard Hirst <rhirst@linuxcare.com>]

On Sun, Jun 03, 2001 at 08:39:12PM -0500, Christian T. Steigies wrote:
> swapped? You mean when they are set? I guess this is the right patch:

Well, I came up with the following, but it does affect things other
than m68k so should not be applied without careful consideration.
OTOH, there where places where powerpc tests system=pmac, and places
where it tests subarch=pmac, so maybe my fix is correct.

Richard


--- boot-floppies.ori/rescue.sh	Sat Jun  2 14:19:09 2001
+++ boot-floppies/rescue.sh	Sun Jun  3 20:02:14 2001
@@ -201,7 +201,7 @@
 append  = single
 EOF
     fi
-    case $system in
+    case $subarch in
 	bvme6000)
             vmearch=bvme
             ;;
@@ -365,7 +365,7 @@
 	# TODO: build a bootable cd image here
 	;;
     m68k)
-        case "$system" in
+        case "$subarch" in
             amiga|atari)
                 mkdosfs -r 112 -F 12 $floppy $blocks
                 fstype=msdos
@@ -452,7 +452,7 @@
 
 # HACK - for kernels with broken loop device handling
 if [ "$arch" = "powerpc" ]; then
-    case "$system" in
+    case "$subarch" in
         prep | pmac)
             info "doing special losetup for this arch"
             losetup /dev/loop7 $floppy
@@ -468,7 +468,7 @@
 mount -o loop $fsopts -t $fstype $floppy $mnt
 
 # for atari, copy bootloader and linux on disk
-if [ "$system" = atari ]; then
+if [ "$subarch" = atari ]; then
     info "installing atari bootloader"
     mkdir $mnt/auto
     # hardcoded bootargs; kernel is in \, bootstrap in \auto
@@ -515,7 +515,7 @@
 
 # copy root.bin to 2880k floppies
 if [ \( "$arch" = i386 -a "$blocks" = "2880" \) -o \
-     \( "$arch/$system" = "m68k/bvme6000" -a "$blocks" = "2880" \) -o \
+     \( "$arch/$subarch" = "m68k/bvme6000" -a "$blocks" = "2880" \) -o \
      \( "$arch" = powerpc -a "$blocks" != "1440" \) ]; then
     info "copying root filesystem ($rootimage) into filesystem"
     cp $rootimage $mnt/root.bin
@@ -536,7 +536,7 @@
 
 suffix=".$arch"                 # can be overriden below
 
-case "$arch/$system" in
+case "$arch/$subarch" in
     */bvme6000|*/mvme16x|*/mvme147)
         suffix=.vme
 	files=debian.txt
@@ -589,13 +589,13 @@
         esac
         ;;
     m68k)
-	case $system in
+	case $subarch in
 	    bvme6000|mvme16x|mvme147)
 		write_vmelilo
                 ;;
 	    atari|amiga|mac)
 		# these LILOs not implemented yet, but need to write install.sh
-		echo "Not writing syslinux for $system !"
+		echo "Not writing syslinux for $subarch !"
 		write_m68kinfo
                 ;;
 	esac