diff options
| -rw-r--r-- | meta/files/fs-perms.txt | 5 | ||||
| -rw-r--r-- | meta/recipes-core/base-files/base-files/fstab | 1 | ||||
| -rw-r--r-- | meta/recipes-core/base-files/base-files_3.0.14.bb | 10 | ||||
| -rw-r--r-- | meta/recipes-core/initscripts/initscripts-1.0/volatiles | 7 |
4 files changed, 11 insertions, 12 deletions
diff --git a/meta/files/fs-perms.txt b/meta/files/fs-perms.txt index becb85c8cb..c829bece2b 100644 --- a/meta/files/fs-perms.txt +++ b/meta/files/fs-perms.txt @@ -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 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} diff --git a/meta/recipes-core/initscripts/initscripts-1.0/volatiles b/meta/recipes-core/initscripts/initscripts-1.0/volatiles index 270f128a12..297245d0e4 100644 --- a/meta/recipes-core/initscripts/initscripts-1.0/volatiles +++ b/meta/recipes-core/initscripts/initscripts-1.0/volatiles @@ -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 |