base-files: make root home mode customisable

Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca>

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index a21b7282fbd0a2767bbf0e201bbba913aa7270f4..cd07b86a99c47806e9ec81d7410ad15cbe30bdab 100644 (file)
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -84,6 +84,7 @@ USRBINPATH_class-nativesdk = "/usr/bin"
 
 # Root home directory
 ROOT_HOME ??= "/home/root"
+ROOT_HOME_MODE ??= "0700"
 
 # If set to boolean true ('yes', 'y', 'true', 't', '1'), /var/log links to /var/volatile/log.
 # If set to boolean false ('no', 'n', 'false', 'f', '0'), /var/log is on persistent storage.

diff --git a/meta/files/fs-perms-persistent-log.txt b/meta/files/fs-perms-persistent-log.txt
index 3a7cf3ab94539ff6e02dedcdf99dc197903e58d0..e16c446484352e960ebfb8642d83ae539d3be80b 100644 (file)
--- a/meta/files/fs-perms-persistent-log.txt
+++ b/meta/files/fs-perms-persistent-log.txt
@@ -59,8 +59,8 @@ ${localstatedir}/local                0755    root    root    false - - -
 /tmp                           01777   root    root    false - - -
 ${localstatedir}/volatile/tmp  01777   root    root    false - - -
 
-# Set 0700
-${ROOT_HOME}                   0700    root    root    false - - -
+# Set ${ROOT_HOME_MODE}, by default 0700.
+${ROOT_HOME}                   ${ROOT_HOME_MODE}       root    root    false - - -
 
 # Set 2775-lsb
 ${localstatedir}/mail          02775   root    mail    false - - -

diff --git a/meta/files/fs-perms.txt b/meta/files/fs-perms.txt
index c8c3ac5dbed419804885f62a0f88eee4a1df428a..ad1803991057656794a889970d7f14b7014405b1 100644 (file)
--- a/meta/files/fs-perms.txt
+++ b/meta/files/fs-perms.txt
@@ -60,8 +60,8 @@ ${localstatedir}/local                0755    root    root    false - - -
 /tmp                           01777   root    root    false - - -
 ${localstatedir}/volatile/tmp  01777   root    root    false - - -
 
-# Set 0700
-${ROOT_HOME}                   0700    root    root    false - - -
+# Set ${ROOT_HOME_MODE}, by default 0700.
+${ROOT_HOME}                   ${ROOT_HOME_MODE}       root    root    false - - -
 
 # Set 2775-lsb
 ${localstatedir}/mail          02775   root    mail    false - - -

diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb
index a4c22c51c77cadf3362767557580ff92ebdfec5a..6267b6494658b92aa4cc6a0fc4605d5aa387ca65 100644 (file)
--- a/meta/recipes-core/base-files/base-files_3.0.14.bb
+++ b/meta/recipes-core/base-files/base-files_3.0.14.bb
@@ -35,7 +35,7 @@ dirs2775 = ""
 dirs555 = "/sys /proc"
 dirs755 = "/boot /dev ${base_bindir} ${base_sbindir} ${base_libdir} \
            ${sysconfdir} ${sysconfdir}/default \
-           ${sysconfdir}/skel ${nonarch_base_libdir} /mnt ${ROOT_HOME} /run \
+           ${sysconfdir}/skel ${nonarch_base_libdir} /mnt /run \
            ${prefix} ${bindir} ${docdir} /usr/games ${includedir} \
            ${libdir} ${sbindir} ${datadir} \
            ${datadir}/common-licenses ${datadir}/dict ${infodir} \
@@ -110,6 +110,8 @@ do_install () {
                ln -sf volatile/$d ${D}${localstatedir}/$d
        done
 
+       install -m ${ROOT_HOME_MODE} -d ${D}${ROOT_HOME}
+
        ln -snf ../run ${D}${localstatedir}/run
        ln -snf ../run/lock ${D}${localstatedir}/lock