merge with master

diff --git a/etc/fstab b/etc/fstab
index 841dbf0..89df404 100644 (file)
--- a/etc/fstab
+++ b/etc/fstab
@@ -1,15 +1,8 @@
 #<file system> <mount point>   <type>  <options>       <dump>  <pass>
 none           /proc           proc    defaults        0 0
 none           /dev/pts        devpts  mode=0622       0 0
-tmpfs           /tmp            tmpfs   defaults        0 0
-#tmpfs           /var          tmpfs   defaults        0 0
+tmpfs       /tmp        tmpfs   defaults        0 0
 none           /sys            sysfs   defaults        0 0
+/opt/var       /var            bind    bind            0 0
 
-#/dev/mmcblk0p2        /boot   vfat    defaults        0 0
-#/dev/mmcblk0p5        /       ext4    defaults        0 0
 LABEL=platform /       auto    defaults        0 0
-LABEL=boot     /boot   auto    defaults        0 0
-LABEL=opt      /opt    auto    defaults        0 0
-#/dev/mmcblk0p6        /opt    ext4    defaults        0 0
-#/dev/mmcblk0p7        /mnt/csc ext4   defaults        0 0
-#/dev/mmcblk0p8        /mnt/ums vfat   uid=0,gid=0,dmask=0000,fmask=0000,iocharset=iso8859-1,utf8,shortname=mixed      0 0

diff --git a/etc/rc.d/rc.firstboot b/etc/rc.d/rc.firstboot
index 21808d3..3ba64b4 100755 (executable)
--- a/etc/rc.d/rc.firstboot
+++ b/etc/rc.d/rc.firstboot
@@ -32,9 +32,6 @@ fi
 chown root:soundpath  /opt/etc/sound/default.conf
 chown -R root:soundpath  /opt/etc/sound/default
 
-# Generate new wifi mac address
-/usr/sbin/wlan_prov
-
 if [ -e /opt/system/csc/.factoryreset ]; then
        rm -f /opt/system/csc/.factoryreset
 fi