From 3c470b4e199b91c16da139eef47df253627f00e3 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 12 Dec 2005 14:45:48 +0000 Subject: oe/packages Updates from Openembedded git-svn-id: https://svn.o-hand.com/repos/poky@188 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- .../packages/base-files/base-files/borzoi/fstab | 37 ++++++++++++++-------- .../packages/base-files/base-files/spitz/fstab | 4 +-- .../packages/base-files/base-files_3.0.14.bb | 2 +- 3 files changed, 26 insertions(+), 17 deletions(-) (limited to 'openembedded/packages/base-files') diff --git a/openembedded/packages/base-files/base-files/borzoi/fstab b/openembedded/packages/base-files/base-files/borzoi/fstab index a44243923..21ef98e6e 100644 --- a/openembedded/packages/base-files/base-files/borzoi/fstab +++ b/openembedded/packages/base-files/base-files/borzoi/fstab @@ -1,19 +1,28 @@ -# Internal -/dev/mtdblock2 / jffs2 rw,noatime 1 1 -/dev/mtdblock3 /home jffs2 defaults,noatime 1 2 -proc /proc proc defaults 0 0 -/dev/hda1 /media/hdd1 ext3 defaults,noatime,nodiratime 0 0 - -tmpfs /var tmpfs defaults 0 0 -tmpfs /media/ram tmpfs defaults 0 0 +# don't mount /dev/mtdblock2 since Spitz uses pivot_root +# or 2.6 directly boots from the hdd +# /dev/mtdblock2 / jffs2 rw,noatime 1 1 +rootfs / auto defaults 1 1 +proc /proc proc defaults 0 0 +# we can use a normal var filesystem with a microdrive +# tmpfs /var tmpfs defaults 0 0 +tmpfs /media/ram tmpfs defaults 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 +/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 +# +# USB +# +/dev/sda1 /media/usbhdd vfat noauto,umask=000,noatime,iocharset=utf8,codepage=932 0 0 +devpts /dev/pts devpts mode=0620,gid=5 0 0 +usbdevfs /proc/bus/usb usbdevfs noauto 0 0 -# CF Storage -/dev/hdb1 /media/cf ext3 defaults,sync,noauto 0 0 +# +# Harddisk +# +/dev/hda2 /home ext3 noauto,defaults,noatime 0 0 +/dev/hda3 /media/hdd ext3 noauto,defaults,noatime 0 0 diff --git a/openembedded/packages/base-files/base-files/spitz/fstab b/openembedded/packages/base-files/base-files/spitz/fstab index a418e3c6e..21ef98e6e 100644 --- a/openembedded/packages/base-files/base-files/spitz/fstab +++ b/openembedded/packages/base-files/base-files/spitz/fstab @@ -24,5 +24,5 @@ usbdevfs /proc/bus/usb usbdevfs noauto 0 0 # # Harddisk # -/dev/hda2 /media/hdd ext3 noauto,defaults,noatime 0 0 - +/dev/hda2 /home ext3 noauto,defaults,noatime 0 0 +/dev/hda3 /media/hdd ext3 noauto,defaults,noatime 0 0 diff --git a/openembedded/packages/base-files/base-files_3.0.14.bb b/openembedded/packages/base-files/base-files_3.0.14.bb index 88b2735b5..7d53464a2 100644 --- a/openembedded/packages/base-files/base-files_3.0.14.bb +++ b/openembedded/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 = "r43" +PR = "r44" LICENSE = "GPL" SRC_URI = " \ -- cgit v1.2.3