diff options
| author | Rod Whitby <rod@whitby.id.au> | 2006-02-06 00:46:35 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-02-06 00:46:35 +0000 |
| commit | 9b188ea2600bce6ed35559b21677bd8b7223f5a8 (patch) | |
| tree | 40e9328ce853279c0eae8ecc851d514ef01c26d1 /packages/altboot/files/altboot-menu/15-bootSD | |
| parent | 76107d774ec7a96b7788d2f2b98b5621a04cfe71 (diff) | |
| parent | 1be31761f3449cd4f92508fd2c2c41968039c918 (diff) | |
merge of 1133a2f6d7624f04cdda9771f28e1502680e7213
and 59438d13db19ded8e22646fb8cddf849804f3a90
Diffstat (limited to 'packages/altboot/files/altboot-menu/15-bootSD')
| -rw-r--r-- | packages/altboot/files/altboot-menu/15-bootSD | 38 |
1 files changed, 4 insertions, 34 deletions
diff --git a/packages/altboot/files/altboot-menu/15-bootSD b/packages/altboot/files/altboot-menu/15-bootSD index d086cde344..7123491000 100644 --- a/packages/altboot/files/altboot-menu/15-bootSD +++ b/packages/altboot/files/altboot-menu/15-bootSD @@ -15,43 +15,13 @@ die() { # This function is activated by init.altboot by calling this script with the "run" option run_module() { - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" + test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - echo -n "Mounting rootfs rw..." >/dev/tty0 - mount -o remount,rw / >/dev/tty0 2>&1 && echo ok >/dev/tty0|| die "mount -o remount,rw / failed" + # Mount /proc, etc + init_rootfs - echo -n "Generating device files..." >/dev/tty0 - /etc/init.d/devices start && echo ok >/dev/tty0|| die "FAILED" + mount_sd - # We can't trust that the SD device file is there when running kernel 2.6 w/ udev - # and starting udev at this point may not be the best idea... - - if `uname -r | grep -q "2.6"` - then - #Let's just assume the device file name never changes... - dev_no="`echo "$SD_DEVICE" | sed -n "s/\/dev\/mmcblk\(.*\)p\(.*\)/\1/p"`" - part_no="`echo "/dev/mmcblk0p1" | sed -n "s/\/dev\/mmcblk\(.*\)p\(.*\)/\2/p"`" - ! test -e /dev/mmcblk${dev_no} && mknod /dev/mmcblk${dev_no} b 254 0 - ! test -e /dev/mmcblk${dev_no}p${part_no} && mknod /dev/mmcblk${dev_no}p${part_no} b 254 $part_no - fi - - # Kernel 2.6 has the SD driver compiled into the kernel - if test -n "$SD_KERNEL_MODULE" - 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 - - 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" - - echo "" - - # Give the SD and CF mounting some time. This is a must for SD - sleep 2 - # Check for a real fs and loop-images. check_target "$SD_MOUNTPOINT" >/dev/tty0 |