summaryrefslogtreecommitdiff
path: root/packages/altboot/files/altboot.func
diff options
context:
space:
mode:
authorMatthias Hentges <oe@hentges.net>2006-02-23 03:08:49 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-02-23 03:08:49 +0000
commitf8955e0dc7898ad33000cd50f92b3ea15e84169e (patch)
tree69f1c3f733a7b7e6d4f59e03a1f12bc0698f7a34 /packages/altboot/files/altboot.func
parentf8d1004925f54ddab0e3385463c0725f47f50c72 (diff)
altboot: More kernel 2.4 fixes
Diffstat (limited to 'packages/altboot/files/altboot.func')
-rw-r--r--packages/altboot/files/altboot.func8
1 files changed, 4 insertions, 4 deletions
diff --git a/packages/altboot/files/altboot.func b/packages/altboot/files/altboot.func
index 9b570111e8..ec3479257e 100644
--- a/packages/altboot/files/altboot.func
+++ b/packages/altboot/files/altboot.func
@@ -278,7 +278,7 @@ check_fs() {
elif [ -e /sbin/e2fsck ]; then
FSCK="/sbin/e2fsck"
fi
- FSCK="$FSCK -p"
+ test -n "$FSCK" && FSCK="$FSCK -p"
;;
vfat)
if [ -e /sbin/dosfsck ]; then
@@ -351,8 +351,8 @@ mount_cf(){
if mount | grep -q "/media/cf "
then
echo "Note: /media/cf is already mounted"
- else
- /etc/init.d/pcmcia start || die "/etc/init.d/pcmcia/start failed!"
+ else
+ /etc/init.d/pcmcia status | grep -q running || /etc/init.d/pcmcia start && echo "Note: cardmgr already active"
echo ""
@@ -369,7 +369,7 @@ mount_home(){
echo "Note: /home is already mounted"
else
- if ( grep -q "/home " /etc/fstab )
+ if ( cat /etc/fstab | grep -v "^#" | grep "/home " )
then
echo "Mounting /home"
home_fstab="`grep "/home " /etc/fstab`"