summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/base-files/base-files/akita/fstab4
-rw-r--r--packages/base-files/base-files/c7x0/fstab2
-rw-r--r--packages/base-files/base-files/collie/fstab6
-rw-r--r--packages/base-files/base-files/poodle/fstab2
-rw-r--r--packages/base-files/base-files/spitz/fstab2
-rw-r--r--packages/base-files/base-files/tosa/fstab2
-rw-r--r--packages/base-files/base-files_3.0.14.bb2
7 files changed, 12 insertions, 8 deletions
diff --git a/packages/base-files/base-files/akita/fstab b/packages/base-files/base-files/akita/fstab
index 8a2b07a089..46b778600e 100644
--- a/packages/base-files/base-files/akita/fstab
+++ b/packages/base-files/base-files/akita/fstab
@@ -8,12 +8,12 @@ tmpfs /media/ram tmpfs defaults 0 0
tmpfs /dev/shm tmpfs mode=0777 0 0
# SD/MMC in kernel 2.4
-/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0
+#/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0
# SD/MMC in kernel 2.6
/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0
# USB Storage
/dev/sda1 /media/usbhdd vfat noauto,umask=000,noatime,iocharset=utf8,codepage=932 0 0
-usbfs /proc/bus/usb usbf defaults 0 0
+usbfs /proc/bus/usb usbfs defaults 0 0
diff --git a/packages/base-files/base-files/c7x0/fstab b/packages/base-files/base-files/c7x0/fstab
index c3de8d28dc..54fe556905 100644
--- a/packages/base-files/base-files/c7x0/fstab
+++ b/packages/base-files/base-files/c7x0/fstab
@@ -8,6 +8,6 @@ tmpfs /media/ram tmpfs defaults 0 0
tmpfs /dev/shm tmpfs mode=0777 0 0
# SD/MMC in kernel 2.4
-/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0
+#/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0
# SD/MMC in kernel 2.6
/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0
diff --git a/packages/base-files/base-files/collie/fstab b/packages/base-files/base-files/collie/fstab
index a3a9ea2df1..c2e3f3c189 100644
--- a/packages/base-files/base-files/collie/fstab
+++ b/packages/base-files/base-files/collie/fstab
@@ -1,9 +1,13 @@
/dev/mtdblock4 / jffs2 defaults 1 1
proc /proc proc defaults 0 0
/dev/hda1 /media/cf auto defaults,sync,noauto,noatime,user,exec,suid,gid=100,umask=0002 0 0
-/dev/mmcda1 /media/card auto defaults,sync,noauto,noatime,user,exec,suid 0 0
tmpfs /var/volatile tmpfs mode=0755 0 0
tmpfs /dev/shm tmpfs mode=0777 0 0
# we use a non-volatile ramdisk, see /etc/init.d/ramdisk
#tmpfs /media/ram tmpfs defaults 0 0
+
+# SD/MMC in kernel 2.4
+#/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0
+# SD/MMC in kernel 2.6
+/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0
diff --git a/packages/base-files/base-files/poodle/fstab b/packages/base-files/base-files/poodle/fstab
index 9f87b91155..64076fa181 100644
--- a/packages/base-files/base-files/poodle/fstab
+++ b/packages/base-files/base-files/poodle/fstab
@@ -7,7 +7,7 @@ proc /proc proc defaults 0 0
/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0
# SD/MMC in kernel 2.4
-/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0
+#/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0
tmpfs /dev/shm tmpfs mode=0777 0 0
tmpfs /var/volatile tmpfs mode=0755 0 0
diff --git a/packages/base-files/base-files/spitz/fstab b/packages/base-files/base-files/spitz/fstab
index f266212135..dc419e62be 100644
--- a/packages/base-files/base-files/spitz/fstab
+++ b/packages/base-files/base-files/spitz/fstab
@@ -12,7 +12,7 @@ tmpfs /dev/shm tmpfs mode=0777 0 0
# Compact Flash memory cards
/dev/hdc1 /media/cf auto defaults,sync,noauto 0 0
# SD/MMC in kernel 2.4
-/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0
+#/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0
# SD/MMC in kernel 2.6
/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0
diff --git a/packages/base-files/base-files/tosa/fstab b/packages/base-files/base-files/tosa/fstab
index 8607c79be8..badbebe1f7 100644
--- a/packages/base-files/base-files/tosa/fstab
+++ b/packages/base-files/base-files/tosa/fstab
@@ -10,6 +10,6 @@ tmpfs /dev/shm tmpfs mode=0777 0 0
usbfs /proc/bus/usb usbfs auto 0 0
# SD/MMC in kernel 2.4
-/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0
+#/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0
# SD/MMC in kernel 2.6
/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0
diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb
index 7ccd26b5cf..98b522c1bd 100644
--- a/packages/base-files/base-files_3.0.14.bb
+++ b/packages/base-files/base-files_3.0.14.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Miscellaneous files for the base system."
SECTION = "base"
PRIORITY = "required"
-PR = "r74"
+PR = "r75"
LICENSE = "GPL"
SRC_URI = " \