diff options
| author |   Felix Domke <tmbinc@elitedvb.ne> | 2006-01-02 21:55:30 +0000 |
|---|---|---|
| committer |   OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-02 21:55:30 +0000 |
| commit | 5c303566e57f941d66e34db4a8a4507a4f3c83bc (patch) | |
| tree | bd6dd7624976d8216fb622c810195da339f8f1b6 /packages/base-files | |
| parent | d845f6c2000b9817052c705a3d982d1d091ac9cd (diff) | |
| parent | 6d39de8ebc7d066129342f5b298ac927e03af3a8 (diff) | |
| download | openembedded-5c303566e57f941d66e34db4a8a4507a4f3c83bc.tar.gz | |
propagate from branch 'org.openembedded.dev' (head 0c9523750070677ec90bef438dcb7fd7a42b2adf)
to branch 'org.openembedded.dreambox' (head dc98c6c1d3b4fff5128452a29348682fd54b116b)
Diffstat (limited to 'packages/base-files')
| -rw-r--r-- | packages/base-files/base-files/borzoi/fstab | 37 | ||||
| -rw-r--r-- | packages/base-files/base-files/nokia770/fstab | 10 | ||||
| -rw-r--r-- | packages/base-files/base-files/simpad/fstab | 2 | ||||
| -rw-r--r-- | packages/base-files/base-files/spitz/fstab | 12 | ||||
| -rw-r--r-- | packages/base-files/base-files_3.0.14.bb | 2 |
5 files changed, 38 insertions, 25 deletions
diff --git a/packages/base-files/base-files/borzoi/fstab b/packages/base-files/base-files/borzoi/fstab index a44243923a..f56ee749f4 100644 --- a/packages/base-files/base-files/borzoi/fstab +++ b/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 defaults 0 0 +/dev/hda3 /media/hdd ext3 defaults 0 0 diff --git a/packages/base-files/base-files/nokia770/fstab b/packages/base-files/base-files/nokia770/fstab index 3224c61b5e..68b56b63e3 100644 --- a/packages/base-files/base-files/nokia770/fstab +++ b/packages/base-files/base-files/nokia770/fstab @@ -1,4 +1,6 @@ -rootfs / rootfs defaults,errors=remount-ro,noatime 0 0 -/dev/mmcblk0p1 /media/card auto defaults,noauto,noatime,user,exec,suid 0 0 -tmpfs /var tmpfs defaults 0 0 -tmpfs /media/ram tmpfs defaults 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/packages/base-files/base-files/simpad/fstab b/packages/base-files/base-files/simpad/fstab index f946c50c6c..99b87714e5 100644 --- a/packages/base-files/base-files/simpad/fstab +++ b/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 diff --git a/packages/base-files/base-files/spitz/fstab b/packages/base-files/base-files/spitz/fstab index b4fc969634..f56ee749f4 100644 --- a/packages/base-files/base-files/spitz/fstab +++ b/packages/base-files/base-files/spitz/fstab @@ -1,16 +1,18 @@ # 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 -tmpfs /var tmpfs 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/hdb1 /media/cf auto defaults,sync,noauto 0 0 +/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 # 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 @@ -22,5 +24,5 @@ usbdevfs /proc/bus/usb usbdevfs noauto 0 0 # # Harddisk # -/dev/hda1 /media/hdd ext3 noauto,defaults,noatime 0 0 - +/dev/hda2 /home ext3 defaults 0 0 +/dev/hda3 /media/hdd ext3 defaults 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 9eec3b0e51..78cb687c8f 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 = "r41" +PR = "r45" LICENSE = "GPL" SRC_URI = " \ |