]> git.openpandora.org Git - openembedded.git/commitdiff
altboot: Fix fsck on loop-images, unb0rking SD, CF and NFS booting of loop-images.
authorMatthias Hentges <oe@hentges.net>
Sun, 14 Aug 2005 10:07:02 +0000 (10:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 14 Aug 2005 10:07:02 +0000 (10:07 +0000)
packages/altboot/altboot.bb
packages/altboot/files/akita/altboot.cfg
packages/altboot/files/altboot.func
packages/altboot/files/collie/altboot.cfg
packages/altboot/files/poodle/altboot.cfg

index a0b5996d6ce7067af5a9af76db788a0d500301ee..a322dacdd93e873d684be03be648328e1cb57cde 100644 (file)
@@ -6,7 +6,7 @@ MAINTAINER = "Matthias 'CoreDump' Hentges  <oe@hentges.net>"
 LICENSE = "GPL"
  
 
-PR = "r7"
+PR = "r8"
 
 
 SRC_URI = "file://altboot-menu \
index 254aac95a2ea4207dd5cda2906f65f20a2dbc898..8361b28f2a7e27d7d30f2e633622e734e780a90a 100644 (file)
@@ -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"
index 642587b630d0e9322a7bdb0959c384b323f047da..0598c8ce93339003bd1ac539e6431a8300758358 100644 (file)
@@ -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"
 
index 5b979e7ae43bb83aa8ab33efabc932ea360528e3..9d2560f76ba030091fef9095ff4fbec253bd15bd 100644 (file)
@@ -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"
index 5b979e7ae43bb83aa8ab33efabc932ea360528e3..9d2560f76ba030091fef9095ff4fbec253bd15bd 100644 (file)
@@ -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"