Apply more chanegs from OE

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@272 311d38ba-8fff-0310-9ca6-ca027cbcb966

3 files changed, 5 insertions, 10 deletions

diff --git a/openembedded/packages/base-files/base-files/openslug/fstab b/openembedded/packages/base-files/base-files/openslug/fstab
deleted file mode 100644
index 0ac6b1460c..0000000000
--- a/openembedded/packages/base-files/base-files/openslug/fstab
+++ /dev/null
@@ -1,5 +0,0 @@
-rootfs          /               jffs2   defaults        1  1
-proc            /proc           proc    defaults        0  0
-tmpfs           /var            tmpfs   defaults        0  0
-tmpfs           /media/ram      tmpfs   defaults        0  0
-usbfs           /proc/bus/usb   usbfs   defaults        0  0
diff --git a/openembedded/packages/base-files/base-files/tosa/fstab b/openembedded/packages/base-files/base-files/tosa/fstab
index 886b065b52..fb37e07aec 100644
--- a/openembedded/packages/base-files/base-files/tosa/fstab
+++ b/openembedded/packages/base-files/base-files/tosa/fstab
@@ -9,4 +9,4 @@ 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,auto      0  0
+/dev/mmcblk0p1  /media/card     auto    defaults,sync,noauto    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 d23c43046a..0689cfa0f3 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 = "r45"
+PR = "r47"
 LICENSE = "GPL"
 
 SRC_URI = " \
@@ -46,7 +46,7 @@ conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \
              ${sysconfdir}/default"
 
 hostname = "openembedded"
-hostname_openslug = "openslug"
+hostname_slugos = "nslu2"
 hostname_mnci = "MNCI"
 PACKAGE_ARCH_mnci = "mnci"
 hostname_rt3000 = "MNRT"
@@ -121,7 +121,7 @@ do_install_append_nylon() {
         ln -sf /var/tmp ${D}/tmp
 }
 
-do_install_append_openslug() {
+do_install_append_slugos() {
         printf "" "" >${D}${sysconfdir}/resolv.conf
         rm -r ${D}/mnt/*
         rmdir ${D}/home/root
@@ -146,5 +146,5 @@ FILES_${PN}-unslung = ""
 
 CONFFILES_${PN} = "${sysconfdir}/fstab ${sysconfdir}/hostname"
 CONFFILES_${PN}_nylon = "${sysconfdir}/resolv.conf ${sysconfdir}/fstab ${sysconfdir}/hostname"
-CONFFILES_${PN}_openslug = "${sysconfdir}/resolv.conf ${sysconfdir}/fstab ${sysconfdir}/hostname"
+CONFFILES_${PN}_slugos = "${sysconfdir}/resolv.conf ${sysconfdir}/fstab ${sysconfdir}/hostname"