From ea647cd9eebdc3e3121b84074519c4bb305adac9 Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Sun, 26 May 2013 21:13:01 +1000 Subject: base-files: add /run directory from FHS 3 draft specification This adds the /run directory from the Filesystem Hierarchy Standard 3.0 Draft [1] and refactors the filesystem as follows: - Remove creation of /var/volatile/run - Remove creation of /var/volatile/lock - Remove symbolic link from /var/run to /var/volatile/run - Remove symbolic link from /var/lock to /var/volatile/lock - Add symbolic link from /var/run to /run - Add symbolic link from /var/lock -> /run/lock - Add /run to /etc/fstab for sysvinit compatibility [1] http://www.linuxbase.org/betaspecs/fhs/fhs.html#runRuntimeVariableData (From OE-Core rev: 0e326280a15b0f2c4ef2ef4ec441f63f55b75873) Signed-off-by: Jonathan Liu Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-core/base-files/base-files/fstab | 1 + meta/recipes-core/base-files/base-files_3.0.14.bb | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'meta/recipes-core/base-files') diff --git a/meta/recipes-core/base-files/base-files/fstab b/meta/recipes-core/base-files/base-files/fstab index f0eed36ed7..dd613a1953 100644 --- a/meta/recipes-core/base-files/base-files/fstab +++ b/meta/recipes-core/base-files/base-files/fstab @@ -4,6 +4,7 @@ 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 usbdevfs noauto 0 0 +tmpfs /run tmpfs mode=0755,nodev,nosuid,strictatime 0 0 tmpfs /var/volatile tmpfs defaults 0 0 tmpfs /media/ram tmpfs defaults 0 0 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 a56450dc3f..ac85ed9a5f 100644 --- a/meta/recipes-core/base-files/base-files_3.0.14.bb +++ b/meta/recipes-core/base-files/base-files_3.0.14.bb @@ -31,10 +31,10 @@ S = "${WORKDIR}" INHIBIT_DEFAULT_DEPS = "1" docdir_append = "/${P}" -dirs1777 = "/tmp ${localstatedir}/volatile/lock ${localstatedir}/volatile/tmp" +dirs1777 = "/tmp ${localstatedir}/volatile/tmp" dirs2775 = "/home ${prefix}/src ${localstatedir}/local" dirs755 = "/bin /boot /dev ${sysconfdir} ${sysconfdir}/default \ - ${sysconfdir}/skel /lib /mnt /proc ${ROOT_HOME} /sbin \ + ${sysconfdir}/skel /lib /mnt /proc ${ROOT_HOME} /run /sbin \ ${prefix} ${bindir} ${docdir} /usr/games ${includedir} \ ${libdir} ${sbindir} ${datadir} \ ${datadir}/common-licenses ${datadir}/dict ${infodir} \ @@ -42,9 +42,7 @@ dirs755 = "/bin /boot /dev ${sysconfdir} ${sysconfdir}/default \ ${localstatedir}/backups ${localstatedir}/lib \ /sys ${localstatedir}/lib/misc ${localstatedir}/spool \ ${localstatedir}/volatile \ - ${localstatedir}/volatile/lock/subsys \ ${localstatedir}/volatile/log \ - ${localstatedir}/volatile/run \ /mnt /media /media/card /media/cf /media/net /media/ram \ /media/union /media/realroot /media/hdd \ /media/mmc1" @@ -54,7 +52,7 @@ dirs3755 = "/srv \ ${prefix}/local/share ${prefix}/local/src" dirs4775 = "/var/mail" -volatiles = "run log lock tmp" +volatiles = "log tmp" conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \ ${sysconfdir}/inputrc ${sysconfdir}/issue /${sysconfdir}/issue.net \ ${sysconfdir}/nsswitch.conf ${sysconfdir}/profile \ @@ -83,6 +81,8 @@ do_install () { for d in card cf net ram; do ln -sf /media/$d ${D}/mnt/$d done + ln -snf ../run ${D}${localstatedir}/run + ln -snf ../run/lock ${D}${localstatedir}/lock ${BASEFILESISSUEINSTALL} -- cgit v1.2.3-54-g00ecf