diff options
| author | Matthias Hentges <oe@hentges.net> | 2005-08-14 10:07:02 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-14 10:07:02 +0000 |
| commit | 314087427f5f87554975e4ccf0a67cecdcadd90e (patch) | |
| tree | 257310f17fe9fbcc1f09e0ca773b706f246c7e2f /packages/altboot | |
| parent | bcce60ff2cd34728d390d8f8ef55f55f456747c0 (diff) | |
altboot: Fix fsck on loop-images, unb0rking SD, CF and NFS booting of loop-images.
Diffstat (limited to 'packages/altboot')
| -rw-r--r-- | packages/altboot/altboot.bb | 2 | ||||
| -rw-r--r-- | packages/altboot/files/akita/altboot.cfg | 1 | ||||
| -rw-r--r-- | packages/altboot/files/altboot.func | 5 | ||||
| -rw-r--r-- | packages/altboot/files/collie/altboot.cfg | 1 | ||||
| -rw-r--r-- | packages/altboot/files/poodle/altboot.cfg | 1 |
5 files changed, 7 insertions, 3 deletions
diff --git a/packages/altboot/altboot.bb b/packages/altboot/altboot.bb index a0b5996d6c..a322dacdd9 100644 --- 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 254aac95a2..8361b28f2a 100644 --- 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 642587b630..0598c8ce93 100644 --- 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 5b979e7ae4..9d2560f76b 100644 --- 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 5b979e7ae4..9d2560f76b 100644 --- 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" |