Merge branch 'tk/master'

3 files changed, 15 insertions, 3 deletions

diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass
index 8b7d3dfcf6..506a7aa1d2 100644
--- a/meta/classes/siteinfo.bbclass
+++ b/meta/classes/siteinfo.bbclass
@@ -76,7 +76,6 @@ def siteinfo_get_files(d):
 
        # Determine which site files to look for
        sites = get_siteinfo_list(d)
-       sites.append("common");
 
        # Check along bbpath for site files and append in reverse order so
        # the application specific sites files are last and system site
diff --git a/meta/packages/initscripts/initscripts-1.0/populate-volatile.sh b/meta/packages/initscripts/initscripts-1.0/populate-volatile.sh
index 8742dbfc6b..1813fd1240 100755
--- a/meta/packages/initscripts/initscripts-1.0/populate-volatile.sh
+++ b/meta/packages/initscripts/initscripts-1.0/populate-volatile.sh
@@ -168,7 +168,20 @@ apply_cfgfile() {
 
   }
 
-if test -e /etc/volatile.cache -a "$VOLATILE_ENABLE_CACHE" = "yes" -a "x$1" != "xupdate"
+clearcache=0
+exec 9</proc/cmdline
+while read line <&9
+do
+        case "$line" in
+                *clearcache*)  clearcache=1
+                               ;;
+                *)             continue
+                               ;;
+        esac
+done
+exec 9>&-
+
+if test -e /etc/volatile.cache -a "$VOLATILE_ENABLE_CACHE" = "yes" -a "x$1" != "xupdate" -a "x$clearcache" = "x0"
 then
         sh /etc/volatile.cache
 else    
diff --git a/meta/packages/initscripts/initscripts_1.0.bb b/meta/packages/initscripts/initscripts_1.0.bb
index 20503e1c6a..0d79b53a8c 100644
--- a/meta/packages/initscripts/initscripts_1.0.bb
+++ b/meta/packages/initscripts/initscripts_1.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
 DEPENDS = "makedevs"
 RDEPENDS = "makedevs"
 LICENSE = "GPLv2"
-PR = "r121"
+PR = "r122"
 
 SRC_URI = "file://functions \
            file://halt \