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 <net147@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
beea111782
commit
ea647cd9ee
|
@ -45,15 +45,14 @@ ${oldincludedir} 0755 root root true 0644 root root
|
|||
|
||||
# Items from base-files
|
||||
# Links
|
||||
${localstatedir}/run link volatile/run
|
||||
${localstatedir}/run link /run
|
||||
${localstatedir}/log link volatile/log
|
||||
${localstatedir}/lock link volatile/lock
|
||||
${localstatedir}/lock link /run/lock
|
||||
${localstatedir}/tmp link volatile/tmp
|
||||
|
||||
# Special permissions from base-files
|
||||
# Set 1777
|
||||
/tmp 01777 root root false - - -
|
||||
${localstatedir}/volatile/lock 01777 root root false - - -
|
||||
${localstatedir}/volatile/tmp 01777 root root false - - -
|
||||
|
||||
# Set 2775
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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}
|
||||
|
||||
|
|
|
@ -21,13 +21,12 @@
|
|||
# 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 1777 /var/volatile/lock none
|
||||
d root root 1777 /run/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 1777 /var/lock /var/volatile/lock
|
||||
l root root 1777 /var/lock /run/lock
|
||||
l root root 0755 /var/log /var/volatile/log
|
||||
l root root 0755 /var/run /var/volatile/run
|
||||
l root root 0755 /var/run /run
|
||||
l root root 1777 /var/tmp /var/volatile/tmp
|
||||
l root root 1777 /tmp /var/tmp
|
||||
d root root 0755 /var/lock/subsys none
|
||||
|
|
Loading…
Reference in New Issue