Skip to contentSkip to conversation

base-files: add /run directory from FHS 3 draft specification

PATCH New Jonathan Liu 1 participant 7 messages May 26, 2013

lore
Share & tools
lore

Jonathan Liu

author
#0 lore raw

cover base-files: add /run directory from FHS 3 draft specification

This is an updated and split up version of the original monolithic patch to add /run directory from FHS 3 draft specification.

For reference, my previously submitted patches (6):
systemd: fix ordering for machineid and run-postinsts services
resolvconf: remove /var/volatile/run/resolvconf/interface from package
boot-directdisk: mount root by MBR disk signature for Linux 3.8+
bind: remove empty /var/run directory
cups: remove /var/run from package as cupsd will populate it on startup
consolekit: remove /var/run from package

Jonathan Liu (6):
base-files: add /run directory from FHS 3 draft specification
systemd: do not create /var/volatile/run and /var/volatile/lock
systemd: do not create symbolic link from /run to /var/run
systemd: remove old /var/run workarounds
udev: do not create /var/volatile/run in init script
udev: do not create symbolic link from /run to /var/run

 meta/files/fs-perms.txt                                   |  5 ++---
 meta/recipes-core/base-files/base-files/fstab             |  1 +
 meta/recipes-core/base-files/base-files_3.0.14.bb         | 10 +++++-----
 meta/recipes-core/initscripts/initscripts-1.0/volatiles   |  7 +++----
 meta/recipes-core/systemd/systemd/00-create-volatile.conf |  2 --
 meta/recipes-core/systemd/systemd/init                    |  4 ----
 meta/recipes-core/systemd/systemd/var-run.conf            |  4 ----
 meta/recipes-core/systemd/systemd_204.bb                  |  3 ---
 meta/recipes-core/udev/udev.inc                           |  6 +-----
 meta/recipes-core/udev/udev/init                          |  1 -
 meta/recipes-core/udev/udev/volatiles                     |  1 -
 11 files changed, 12 insertions(+), 32 deletions(-)
 delete mode 100644 meta/recipes-core/systemd/systemd/var-run.conf
 delete mode 100644 meta/recipes-core/udev/udev/volatiles
Signature · 1 line
1.8.2.3
author
#1 lore raw

PATCH 1/6 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

Signed-off-by Jonathan Liu <[email protected]>
---
 meta/files/fs-perms.txt                                 |  5 ++---
 meta/recipes-core/base-files/base-files/fstab           |  1 +
 meta/recipes-core/base-files/base-files_3.0.14.bb       | 10 +++++-----
 meta/recipes-core/initscripts/initscripts-1.0/volatiles |  7 +++----
 4 files changed, 11 insertions(+), 12 deletions(-)
meta/files/fs-perms.txt +2 -3
index becb85c..c829bec 100644
@@ -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
meta/recipes-core/base-files/base-files/fstab +1 -0
index f0eed36..dd613a1 100644
@@ -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
meta/recipes-core/base-files/base-files_3.0.14.bb +5 -5
index a56450d..ac85ed9 100644
@@ -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}
meta/recipes-core/initscripts/initscripts-1.0/volatiles +3 -4
index 270f128..297245d 100644
@@ -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
Signature · 1 line
1.8.2.3
author
#2 lore raw

PATCH 2/6 systemd: do not create /var/volatile/run and /var/volatile/lock

In reply to Jonathan Liu

The directories are not needed anymore.

Previously:
/var/run -> /var/volatile/run
/var/lock -> /var/volatile/lock

Now:
/var/run -> /run
/var/lock -> /run/lock

Signed-off-by Jonathan Liu <[email protected]>
---
 meta/recipes-core/systemd/systemd/00-create-volatile.conf | 2 --
 meta/recipes-core/systemd/systemd/init                    | 1 -
 2 files changed, 3 deletions(-)
meta/recipes-core/systemd/systemd/00-create-volatile.conf +0 -2
index 6163a9c..9ffa88e 100644
@@ -4,6 +4,4 @@
 
 
 d		/var/volatile/log		-	-	-	-
-d		/var/volatile/lock		-	-	-	-
-d		/var/volatile/run		-	-	-	-
 d		/var/volatile/tmp		-	-	-	-
meta/recipes-core/systemd/systemd/init +0 -1
index ac56cca..a42e732 100644
@@ -42,7 +42,6 @@ case "$1" in
     [ -e /dev/pts ] || mkdir -m 0755 /dev/pts
     [ -e /dev/shm ] || mkdir -m 1777 /dev/shm
     mount -a -t tmpfs 2>/dev/null
-    mkdir -p /var/volatile/run
     if [ ! -e /run ]; then
         ln -s /var/run /run
     fi
Signature · 1 line
1.8.2.3
author
#3 lore raw

PATCH 3/6 systemd: do not create symbolic link from /run to /var/run

In reply to Jonathan Liu

The /run directory already exists as a tmpfs with /var/run as a symbolic link pointing to /run.

Signed-off-by Jonathan Liu <[email protected]>
---
 meta/recipes-core/systemd/systemd/init | 3 ---
 1 file changed, 3 deletions(-)
meta/recipes-core/systemd/systemd/init +0 -3
index a42e732..7e67a50 100644
@@ -42,9 +42,6 @@ case "$1" in
     [ -e /dev/pts ] || mkdir -m 0755 /dev/pts
     [ -e /dev/shm ] || mkdir -m 1777 /dev/shm
     mount -a -t tmpfs 2>/dev/null
-    if [ ! -e /run ]; then
-        ln -s /var/run /run
-    fi
 
     # cache handling
     if [ "$DEVCACHE" != "" ]; then
Signature · 1 line
1.8.2.3
author
#4 lore raw

PATCH 4/6 systemd: remove old /var/run workarounds

In reply to Jonathan Liu

Do not clear /var/run on startup as it is a tmpfs.
Do not create empty /var/run/utmp on startup as it no longer seems needed for systemd-update-utmp-runlevel.service to start properly.

Signed-off-by Jonathan Liu <[email protected]>
---
 meta/recipes-core/systemd/systemd/var-run.conf | 4 ----
 meta/recipes-core/systemd/systemd_204.bb       | 3 ---
 2 files changed, 7 deletions(-)
 delete mode 100644 meta/recipes-core/systemd/systemd/var-run.conf
meta/recipes-core/systemd/systemd/var-run.conf deleted +0 -4
deleted file mode 100644
index c2c18e2..0000000
@@ -1,4 +0,0 @@
-# empty /var/run
-R	/var/run/*	-	-	-	-	-
-# systemd-update-utmp-runlevel.service fails to start without this
-f /var/run/utmp 0644 root root - -
meta/recipes-core/systemd/systemd_204.bb +0 -3
index ec5be1f..9664e04 100644
@@ -20,7 +20,6 @@ inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d update-altern
 SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \
            file://touchscreen.rules \
            file://modprobe.rules \
-           file://var-run.conf \
            ${UCLIBCPATCHES} \
            file://0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch \
            file://00-create-volatile.conf \

@@ -105,8 +104,6 @@ do_install() {
 
 	install -m 0644 ${WORKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/
 
-	install -m 0644 ${WORKDIR}/var-run.conf ${D}${sysconfdir}/tmpfiles.d/
-
 	install -m 0644 ${WORKDIR}/00-create-volatile.conf ${D}${sysconfdir}/tmpfiles.d/
 
 	if ${@base_contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
Signature · 1 line
1.8.2.3
author
#5 lore raw

PATCH 5/6 udev: do not create /var/volatile/run in init script

In reply to Jonathan Liu

Previously in udev init, /var/volatile/run had to be created after mounting all tmpfs filesystems so that udevd can write to /var/run (a symbolic link to /var/volatile/run). This is because udev is started before populate-volatile.sh.

Now that /var/run is a symbolic link to /run (a tmpfs filesystem), /var/volatile/run doesn't need to be created anymore.

Signed-off-by Jonathan Liu <[email protected]>
---
 meta/recipes-core/udev/udev/init | 1 -
 1 file changed, 1 deletion(-)
meta/recipes-core/udev/udev/init +0 -1
index cd87f50..95f9c03 100644
@@ -50,7 +50,6 @@ case "$1" in
     [ -e /dev/pts ] || mkdir -m 0755 /dev/pts
     [ -e /dev/shm ] || mkdir -m 1777 /dev/shm
     mount -a -t tmpfs 2>/dev/null
-    mkdir -p /var/volatile/run
     mkdir -p /var/volatile/tmp
 
     # cache handling
Signature · 1 line
1.8.2.3
author
#6 lore raw

PATCH 6/6 udev: do not create symbolic link from /run to /var/run

In reply to Jonathan Liu

The /run directory is now a tmpfs with /var/run as a symbolic link pointing to /run.

Signed-off-by Jonathan Liu <[email protected]>
---
 meta/recipes-core/udev/udev.inc       | 6 +-----
 meta/recipes-core/udev/udev/volatiles | 1 -
 2 files changed, 1 insertion(+), 6 deletions(-)
 delete mode 100644 meta/recipes-core/udev/udev/volatiles
meta/recipes-core/udev/udev.inc +1 -5
index 769d861..92485f5 100644
@@ -26,8 +26,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
            file://local.rules \
            file://udev-cache \
            file://udev-cache.default \
-           file://init \
-           file://volatiles"
+           file://init"
 
 inherit autotools pkgconfig update-rc.d
 

@@ -85,9 +84,6 @@ do_install_append () {
 	install -d ${D}${sysconfdir}/default
 	install -m 0755 ${WORKDIR}/udev-cache.default ${D}${sysconfdir}/default/udev-cache
 
-	install -d ${D}${sysconfdir}/default/volatiles
-	install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/00_udev
-
 	touch ${D}${sysconfdir}/udev/cache.data
 
 	install -d ${D}${sysconfdir}/udev/rules.d/
meta/recipes-core/udev/udev/volatiles deleted +0 -1
deleted file mode 100644
index e33561b..0000000
@@ -1 +0,0 @@
-l root root 0755 /run /var/run
Signature · 1 line
1.8.2.3