Use default volatiles and mount /run directory with tmpfs.

7 files changed, 6 insertions, 58 deletions

diff --git a/meta-openvuplus/recipes-core/base-files/base-files/filesystems b/meta-openvuplus/recipes-core/base-files/base-files/filesystems
index 32a5dd2..60c78e2 100644
--- a/meta-openvuplus/recipes-core/base-files/base-files/filesystems
+++ b/meta-openvuplus/recipes-core/base-files/base-files/filesystems
@@ -1,6 +1,6 @@
+ext4
 ext3
 ext2
-ext4
 vfat
 fat
 udf
diff --git a/meta-openvuplus/recipes-core/base-files/base-files/fstab b/meta-openvuplus/recipes-core/base-files/base-files/fstab
index 07c55d7..2d1de8c 100644
--- a/meta-openvuplus/recipes-core/base-files/base-files/fstab
+++ b/meta-openvuplus/recipes-core/base-files/base-files/fstab
@@ -1,8 +1,9 @@
 rootfs               /                    auto       defaults              1 1
 proc                 /proc                proc       defaults              0 0
 devpts               /dev/pts             devpts     mode=0620,gid=5       0 0
-usbdevfs             /proc/bus/usb        usbfs      defaults              0 0
-tmpfs                /var/volatile        tmpfs      mode=0755             0 0
+usbdevfs             /proc/bus/usb        usbdevfs   noauto                0  0
+tmpfs                /run                 tmpfs      mode=0755,nodev,nosuid,strictatime 0  0
+tmpfs                /var/volatile        tmpfs      defaults              0  0
 tmpfs                /dev/shm             tmpfs      mode=0777             0 0
 /dev/sda1            /media/hdd           auto       defaults              0 0
 
diff --git a/meta-openvuplus/recipes-core/base-files/base-files_3.0.14.bbappend b/meta-openvuplus/recipes-core/base-files/base-files_3.0.14.bbappend
index 485253e..d419cb4 100644
--- a/meta-openvuplus/recipes-core/base-files/base-files_3.0.14.bbappend
+++ b/meta-openvuplus/recipes-core/base-files/base-files_3.0.14.bbappend
@@ -1,4 +1,4 @@
-PR .= "-vuplus0"
+PR .= "-vuplus1"
 
 do_install_append() {
 	rm -rf ${D}/hdd
diff --git a/meta-openvuplus/recipes-core/initscripts/initscripts-1.0/bootmisc.sh b/meta-openvuplus/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
index 4f76cb4..80f7ead 100644
--- a/meta-openvuplus/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
+++ b/meta-openvuplus/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
@@ -54,13 +54,6 @@ fi
 
 #
 # This is as good a place as any for a sanity check
-# /tmp should be a symlink to /var/tmp to cut down on the number
-# of mounted ramdisks.
-if test ! -L /tmp && test -d /var/tmp
-then
-	rm -rf /tmp
-	ln -sf /var/tmp /tmp
-fi
 
 # Set the system clock from hardware clock
 # If the timestamp is more recent than the current time,
diff --git a/meta-openvuplus/recipes-core/initscripts/initscripts-1.0/volatiles b/meta-openvuplus/recipes-core/initscripts/initscripts-1.0/volatiles
deleted file mode 100644
index b2ae279..0000000
--- a/meta-openvuplus/recipes-core/initscripts/initscripts-1.0/volatiles
+++ /dev/null
@@ -1,39 +0,0 @@
-# This configuration file lists filesystem objects that should get verified
-# during startup and be created if missing.
-#
-# Every line must either be a comment starting with #
-# or a definition of format:
-# <type> <owner> <group> <mode> <path> <linksource>
-# where the items are separated by whitespace !
-#
-# <type> : d|f|l : (d)irectory|(f)ile|(l)ink
-#
-# A linking example:
-# l root root 0777 /var/test /tmp/testfile
-# f root root 0644 /var/test none
-#
-# Understanding links:
-# When populate-volatile is to verify/create a directory or file, it will first
-# check it's existence. If a link is found to exist in the place of the target,
-# the path of the target is replaced with the target the link points to.
-# Thus, if a link is in the place to be verified, the object will be created
-# in the place the link points to instead.
-# This explains the order of "link before object" as in the example above, where
-# a link will be created at /var/test pointing to /tmp/testfile and due to this
-# link the file defined as /var/test will actually be created as /tmp/testfile.
-d root root 0755 /var/volatile/cache none
-d root root 1777 /var/volatile/lock none
-d root root 0755 /var/volatile/log none
-d root root 0755 /var/volatile/run none
-d root root 1777 /var/volatile/tmp none
-l root root 0755 /var/cache /var/volatile/cache
-l root root 1777 /var/lock /var/volatile/lock
-l root root 0755 /var/log /var/volatile/log
-l root root 0755 /var/run /var/volatile/run
-l root root 1777 /var/tmp /var/volatile/tmp
-d root root 0755 /var/lock/subsys none
-f root root 0664 /var/log/wtmp none
-f root root 0664 /var/run/utmp none
-l root root 0644 /etc/resolv.conf /var/run/resolv.conf
-f root root 0644 /var/run/resolv.conf none
-
diff --git a/meta-openvuplus/recipes-core/initscripts/initscripts-1.0/vusolo/bootmisc.sh b/meta-openvuplus/recipes-core/initscripts/initscripts-1.0/vusolo/bootmisc.sh
index c2a9536..c73af09 100755
--- a/meta-openvuplus/recipes-core/initscripts/initscripts-1.0/vusolo/bootmisc.sh
+++ b/meta-openvuplus/recipes-core/initscripts/initscripts-1.0/vusolo/bootmisc.sh
@@ -54,13 +54,6 @@ fi
 
 #
 # This is as good a place as any for a sanity check
-# /tmp should be a symlink to /var/tmp to cut down on the number
-# of mounted ramdisks.
-if test ! -L /tmp && test -d /var/tmp
-then
-	rm -rf /tmp
-	ln -sf /var/tmp /tmp
-fi
 
 # Set the system clock from hardware clock
 # If the timestamp is more recent than the current time,
diff --git a/meta-openvuplus/recipes-core/initscripts/initscripts_1.0.bbappend b/meta-openvuplus/recipes-core/initscripts/initscripts_1.0.bbappend
index 501ba2f..9474af7 100644
--- a/meta-openvuplus/recipes-core/initscripts/initscripts_1.0.bbappend
+++ b/meta-openvuplus/recipes-core/initscripts/initscripts_1.0.bbappend
@@ -1,4 +1,4 @@
-PR .= "-vuplus10"
+PR .= "-vuplus11"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"