diff options
| author | Richard Purdie <richard@openedhand.com> | 2005-10-10 10:41:35 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2005-10-10 10:41:35 +0000 |
| commit | cbf3ef91305558fb8a59e19c5987a9e9ca22013a (patch) | |
| tree | f7142e57734a8b2fac92ff758a6617d4464a82f9 /openembedded/packages/base-files | |
| parent | 562d4d35878bb644cbe2b9f23ef407fd6e1e38e2 (diff) | |
| download | poky-cbf3ef91305558fb8a59e19c5987a9e9ca22013a.tar.gz | |
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/fstab | 14 | ||||
| -rw-r--r-- | openembedded/packages/base-files/base-files/simpad/fstab | 2 |
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 4b6a5e1e17..68b56b63e3 100644 --- a/openembedded/packages/base-files/base-files/nokia770/fstab +++ b/openembedded/packages/base-files/base-files/nokia770/fstab | |||
| @@ -1,8 +1,6 @@ | |||
| 1 | rootfs / rootfs defaults,errors=remount-ro,noatime 0 0 | 1 | rootfs / rootfs defaults,errors=remount-ro,noatime 0 0 |
| 2 | /dev/mmcblk0p1 /media/card auto defaults,noauto,noatime,exec,suid 0 0 | 2 | /dev/mmcblk0p1 /media/card auto defaults,noauto,noatime,exec,suid 0 0 |
| 3 | tmpfs /var tmpfs defaults 0 0 | 3 | tmpfs /var tmpfs defaults 0 0 |
| 4 | tmpfs /media/ram tmpfs defaults 0 0 | 4 | tmpfs /media/ram tmpfs defaults 0 0 |
| 5 | rootfs / auto defaults 1 1 | 5 | proc /proc proc defaults 0 0 |
| 6 | proc /proc proc defaults 0 0 | 6 | usbdevfs /proc/bus/usb usbdevfs noauto 0 0 |
| 7 | devpts /dev/pts devpts mode=0620,gid=5 0 0 | ||
| 8 | 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 f946c50c6c..99b87714e5 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 | |||
| 4 | usbdevfs /proc/bus/usb usbdevfs noauto 0 0 | 4 | usbdevfs /proc/bus/usb usbdevfs noauto 0 0 |
| 5 | tmpfs /var tmpfs defaults 0 0 | 5 | tmpfs /var tmpfs defaults 0 0 |
| 6 | /dev/mtdblock/2 /home jffs2 defaults 1 1 | 6 | /dev/mtdblock/2 /home jffs2 defaults 1 1 |
| 7 | 7 | /dev/hda1 /mnt/cf auto noauto,owner 0 0 | |