diff options
| author | Matthias Hentges <oe@hentges.net> | 2006-04-11 19:16:44 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-04-11 19:16:44 +0000 |
| commit | afc095a619d1a7aac3832ac2eda1ed41ed96a162 (patch) | |
| tree | b453dec6fd9741fef3e52fc74e6fc5b5af700527 /packages/altboot/files | |
| parent | df9e8af5afc6822ec5764671d3e2ca62b97b2b28 (diff) | |
altboot: Fix tar.gz installer to work w/o inserted cf or sd cards, fix mount_cf to work with udev
Diffstat (limited to 'packages/altboot/files')
| -rw-r--r-- | packages/altboot/files/altboot-menu/Advanced/40-bootNFS | 2 | ||||
| -rw-r--r-- | packages/altboot/files/altboot-menu/Advanced/70-install-tgz | 2 | ||||
| -rw-r--r-- | packages/altboot/files/altboot.func | 18 |
3 files changed, 15 insertions, 7 deletions
diff --git a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS index e81526d251..33d5f2795a 100644 --- a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS +++ b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS @@ -7,7 +7,7 @@ M_TITLE="Boot from NFS" die() { - echo "ERROR: $1" >/dev/tty0 + echo -e "ERROR: $1" >/dev/tty0 exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1 } diff --git a/packages/altboot/files/altboot-menu/Advanced/70-install-tgz b/packages/altboot/files/altboot-menu/Advanced/70-install-tgz index cdfa052747..2ee92cd27e 100644 --- a/packages/altboot/files/altboot-menu/Advanced/70-install-tgz +++ b/packages/altboot/files/altboot-menu/Advanced/70-install-tgz @@ -14,7 +14,7 @@ run_module(){ init_rootfs # Mount - mount_sd + mount_sd ingore_errors mount_cf mount_home diff --git a/packages/altboot/files/altboot.func b/packages/altboot/files/altboot.func index 0cc59116ce..83acb94324 100644 --- a/packages/altboot/files/altboot.func +++ b/packages/altboot/files/altboot.func @@ -474,14 +474,18 @@ mount_sd(){ then echo -n "Loading SD kernel module..." /sbin/insmod $SD_KERNEL_MODULE >/dev/null 2>&1 && echo ok || die "insmod failed" - else - echo "No SD kernel module configured, assuming it's build-in" fi check_fs "$SD_DEVICE" echo -n "Mounting $SD_MOUNTPOINT..." >/dev/tty0 - /bin/mount -t auto -o defaults,noatime $SD_DEVICE $SD_MOUNTPOINT >/dev/null 2>&1 && echo ok >/dev/tty0|| die "/bin/mount -t auto -o defaults,noatime $SD_DEVICE $SD_MOUNTPOINT failed" + + if test "$1" = ingore_errors + then + /bin/mount -t auto -o defaults,noatime $SD_DEVICE $SD_MOUNTPOINT >/dev/null 2>&1 && echo ok >/dev/tty0 || echo "Could not mount SD card" + else + /bin/mount -t auto -o defaults,noatime $SD_DEVICE $SD_MOUNTPOINT >/dev/null 2>&1 && echo ok >/dev/tty0|| die "/bin/mount -t auto -o defaults,noatime $SD_DEVICE $SD_MOUNTPOINT failed" + fi fi echo "" @@ -494,8 +498,12 @@ mount_cf(){ then echo "Note: /media/cf is already mounted" else - /etc/init.d/pcmcia status | grep -q running || /etc/init.d/pcmcia start && echo "Note: cardmgr is already active" - + # As of kernel 2.6.16, /e/i/pcmcia is replaced by udev + if test -x /etc/init.d/pcmcia + then + /etc/init.d/pcmcia status | grep -q running || /etc/init.d/pcmcia start && echo "Note: cardmgr is already active" + fi + echo "" # Give the SD and CF mounting some time. This is a must for SD |