altboot: Fix fsck on loop-images, unb0rking SD, CF and NFS booting of loop-images.

diff --git a/packages/altboot/altboot.bb b/packages/altboot/altboot.bb
index a0b5996..a322dac 100644 (file)
--- a/packages/altboot/altboot.bb
+++ b/packages/altboot/altboot.bb
@@ -6,7 +6,7 @@ MAINTAINER = "Matthias 'CoreDump' Hentges  <oe@hentges.net>"
 LICENSE = "GPL"
  
 
-PR = "r7"
+PR = "r8"
 
 
 SRC_URI = "file://altboot-menu \

diff --git a/packages/altboot/files/akita/altboot.cfg b/packages/altboot/files/akita/altboot.cfg
index 254aac9..8361b28 100644 (file)
--- a/packages/altboot/files/akita/altboot.cfg
+++ b/packages/altboot/files/akita/altboot.cfg
@@ -6,6 +6,7 @@ TIMEOUT="3"
 REAL_INIT="/sbin/init.sysvinit"
 SH_SHELL="/bin/sh"
 IMAGE_PATH="boot-images"
+IMAGE_TYPE="ext2"
 FSCK_IMAGES="yes"
 SD_DEVICE="/dev/mmcda1"
 SD_KERNEL_MODULE="/lib/modules/2.4.20/kernel/drivers/block/sharp_mmcsd_m.o"

diff --git a/packages/altboot/files/altboot.func b/packages/altboot/files/altboot.func
index 642587b..0598c8c 100644 (file)
--- a/packages/altboot/files/altboot.func
+++ b/packages/altboot/files/altboot.func
@@ -151,8 +151,9 @@ pivot_image() {
        if [ "$IMAGE_TYPE" = "" ]; then
                IMAGE_TYPE="auto"
        fi
-       mount -t $IMAGE_TYPE /dev/loop0 /media/image || die "mount /dev/loop0 /media/image failed!"
-
+       # If mount fails it has the tendency to spew out a _lot_ of error messages.
+       # We direct the output to /dev/null so the user can see which step actually failed.
+       mount -t $IMAGE_TYPE /dev/loop0 /media/image >/dev/null 2>&1 || die "mount -t $IMAGE_TYPE  /dev/loop0 /media/image failed!"
 
        mkdir -p /media/image/media/ROM || die "mkdir -p /media/image/media/ROM failed"
 

diff --git a/packages/altboot/files/collie/altboot.cfg b/packages/altboot/files/collie/altboot.cfg
index 5b979e7..9d2560f 100644 (file)
--- a/packages/altboot/files/collie/altboot.cfg
+++ b/packages/altboot/files/collie/altboot.cfg
@@ -7,6 +7,7 @@ TIMEOUT="3"
 REAL_INIT="/sbin/init.sysvinit"
 SH_SHELL="/bin/sh"
 IMAGE_PATH="boot-images"
+IMAGE_TYPE="ext2"
 FSCK_IMAGES="no"
 SD_DEVICE="/dev/mmcda1"
 SD_KERNEL_MODULE="/lib/modules/2.4.18-rmk7-pxa3-embedix/kernel/drivers/block/sharp_mmcsd_m.o"

diff --git a/packages/altboot/files/poodle/altboot.cfg b/packages/altboot/files/poodle/altboot.cfg
index 5b979e7..9d2560f 100644 (file)
--- a/packages/altboot/files/poodle/altboot.cfg
+++ b/packages/altboot/files/poodle/altboot.cfg
@@ -7,6 +7,7 @@ TIMEOUT="3"
 REAL_INIT="/sbin/init.sysvinit"
 SH_SHELL="/bin/sh"
 IMAGE_PATH="boot-images"
+IMAGE_TYPE="ext2"
 FSCK_IMAGES="no"
 SD_DEVICE="/dev/mmcda1"
 SD_KERNEL_MODULE="/lib/modules/2.4.18-rmk7-pxa3-embedix/kernel/drivers/block/sharp_mmcsd_m.o"