summaryrefslogtreecommitdiff
path: root/openembedded/packages/base-files
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2005-10-10 10:41:35 +0000
committerRichard Purdie <richard@openedhand.com>2005-10-10 10:41:35 +0000
commitcbf3ef91305558fb8a59e19c5987a9e9ca22013a (patch)
treef7142e57734a8b2fac92ff758a6617d4464a82f9 /openembedded/packages/base-files
parent562d4d35878bb644cbe2b9f23ef407fd6e1e38e2 (diff)
downloadopenembedded-core-cbf3ef91305558fb8a59e19c5987a9e9ca22013a.tar.gz
openembedded-core-cbf3ef91305558fb8a59e19c5987a9e9ca22013a.tar.bz2
openembedded-core-cbf3ef91305558fb8a59e19c5987a9e9ca22013a.tar.xz
openembedded-core-cbf3ef91305558fb8a59e19c5987a9e9ca22013a.zip
Merge changes from mainline OE to try and keep us in sync.
git-svn-id: https://svn.o-hand.com/repos/poky@127 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/base-files')
-rw-r--r--openembedded/packages/base-files/base-files/nokia770/fstab14
-rw-r--r--openembedded/packages/base-files/base-files/simpad/fstab2
2 files changed, 7 insertions, 9 deletions
diff --git a/openembedded/packages/base-files/base-files/nokia770/fstab b/openembedded/packages/base-files/base-files/nokia770/fstab
index 4b6a5e1e1..68b56b63e 100644
--- a/openembedded/packages/base-files/base-files/nokia770/fstab
+++ b/openembedded/packages/base-files/base-files/nokia770/fstab
@@ -1,8 +1,6 @@
-rootfs / rootfs defaults,errors=remount-ro,noatime 0 0
-/dev/mmcblk0p1 /media/card auto defaults,noauto,noatime,exec,suid 0 0
-tmpfs /var tmpfs defaults 0 0
-tmpfs /media/ram tmpfs defaults 0 0
-rootfs / auto defaults 1 1
-proc /proc proc defaults 0 0
-devpts /dev/pts devpts mode=0620,gid=5 0 0
-usbdevfs /proc/bus/usb usbdevfs noauto 0 0
+rootfs / rootfs defaults,errors=remount-ro,noatime 0 0
+/dev/mmcblk0p1 /media/card auto defaults,noauto,noatime,exec,suid 0 0
+tmpfs /var tmpfs defaults 0 0
+tmpfs /media/ram tmpfs defaults 0 0
+proc /proc proc defaults 0 0
+usbdevfs /proc/bus/usb usbdevfs noauto 0 0
diff --git a/openembedded/packages/base-files/base-files/simpad/fstab b/openembedded/packages/base-files/base-files/simpad/fstab
index f946c50c6..99b87714e 100644
--- a/openembedded/packages/base-files/base-files/simpad/fstab
+++ b/openembedded/packages/base-files/base-files/simpad/fstab
@@ -4,4 +4,4 @@ devpts /dev/pts devpts mode=0620,gid=5 0 0
usbdevfs /proc/bus/usb usbdevfs noauto 0 0
tmpfs /var tmpfs defaults 0 0
/dev/mtdblock/2 /home jffs2 defaults 1 1
-
+/dev/hda1 /mnt/cf auto noauto,owner 0 0