summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/files/fs-perms.txt5
-rw-r--r--meta/recipes-core/base-files/base-files/fstab1
-rw-r--r--meta/recipes-core/base-files/base-files_3.0.14.bb10
-rw-r--r--meta/recipes-core/initscripts/initscripts-1.0/volatiles7
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
45 45
46# Items from base-files 46# Items from base-files
47# Links 47# Links
48${localstatedir}/run link volatile/run 48${localstatedir}/run link /run
49${localstatedir}/log link volatile/log 49${localstatedir}/log link volatile/log
50${localstatedir}/lock link volatile/lock 50${localstatedir}/lock link /run/lock
51${localstatedir}/tmp link volatile/tmp 51${localstatedir}/tmp link volatile/tmp
52 52
53# Special permissions from base-files 53# Special permissions from base-files
54# Set 1777 54# Set 1777
55/tmp 01777 root root false - - - 55/tmp 01777 root root false - - -
56${localstatedir}/volatile/lock 01777 root root false - - -
57${localstatedir}/volatile/tmp 01777 root root false - - - 56${localstatedir}/volatile/tmp 01777 root root false - - -
58 57
59# Set 2775 58# 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
4proc /proc proc defaults 0 0 4proc /proc proc defaults 0 0
5devpts /dev/pts devpts mode=0620,gid=5 0 0 5devpts /dev/pts devpts mode=0620,gid=5 0 0
6usbdevfs /proc/bus/usb usbdevfs noauto 0 0 6usbdevfs /proc/bus/usb usbdevfs noauto 0 0
7tmpfs /run tmpfs mode=0755,nodev,nosuid,strictatime 0 0
7tmpfs /var/volatile tmpfs defaults 0 0 8tmpfs /var/volatile tmpfs defaults 0 0
8tmpfs /media/ram tmpfs defaults 0 0 9tmpfs /media/ram tmpfs defaults 0 0
9 10
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}"
31INHIBIT_DEFAULT_DEPS = "1" 31INHIBIT_DEFAULT_DEPS = "1"
32 32
33docdir_append = "/${P}" 33docdir_append = "/${P}"
34dirs1777 = "/tmp ${localstatedir}/volatile/lock ${localstatedir}/volatile/tmp" 34dirs1777 = "/tmp ${localstatedir}/volatile/tmp"
35dirs2775 = "/home ${prefix}/src ${localstatedir}/local" 35dirs2775 = "/home ${prefix}/src ${localstatedir}/local"
36dirs755 = "/bin /boot /dev ${sysconfdir} ${sysconfdir}/default \ 36dirs755 = "/bin /boot /dev ${sysconfdir} ${sysconfdir}/default \
37 ${sysconfdir}/skel /lib /mnt /proc ${ROOT_HOME} /sbin \ 37 ${sysconfdir}/skel /lib /mnt /proc ${ROOT_HOME} /run /sbin \
38 ${prefix} ${bindir} ${docdir} /usr/games ${includedir} \ 38 ${prefix} ${bindir} ${docdir} /usr/games ${includedir} \
39 ${libdir} ${sbindir} ${datadir} \ 39 ${libdir} ${sbindir} ${datadir} \
40 ${datadir}/common-licenses ${datadir}/dict ${infodir} \ 40 ${datadir}/common-licenses ${datadir}/dict ${infodir} \
@@ -42,9 +42,7 @@ dirs755 = "/bin /boot /dev ${sysconfdir} ${sysconfdir}/default \
42 ${localstatedir}/backups ${localstatedir}/lib \ 42 ${localstatedir}/backups ${localstatedir}/lib \
43 /sys ${localstatedir}/lib/misc ${localstatedir}/spool \ 43 /sys ${localstatedir}/lib/misc ${localstatedir}/spool \
44 ${localstatedir}/volatile \ 44 ${localstatedir}/volatile \
45 ${localstatedir}/volatile/lock/subsys \
46 ${localstatedir}/volatile/log \ 45 ${localstatedir}/volatile/log \
47 ${localstatedir}/volatile/run \
48 /mnt /media /media/card /media/cf /media/net /media/ram \ 46 /mnt /media /media/card /media/cf /media/net /media/ram \
49 /media/union /media/realroot /media/hdd \ 47 /media/union /media/realroot /media/hdd \
50 /media/mmc1" 48 /media/mmc1"
@@ -54,7 +52,7 @@ dirs3755 = "/srv \
54 ${prefix}/local/share ${prefix}/local/src" 52 ${prefix}/local/share ${prefix}/local/src"
55dirs4775 = "/var/mail" 53dirs4775 = "/var/mail"
56 54
57volatiles = "run log lock tmp" 55volatiles = "log tmp"
58conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \ 56conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \
59 ${sysconfdir}/inputrc ${sysconfdir}/issue /${sysconfdir}/issue.net \ 57 ${sysconfdir}/inputrc ${sysconfdir}/issue /${sysconfdir}/issue.net \
60 ${sysconfdir}/nsswitch.conf ${sysconfdir}/profile \ 58 ${sysconfdir}/nsswitch.conf ${sysconfdir}/profile \
@@ -83,6 +81,8 @@ do_install () {
83 for d in card cf net ram; do 81 for d in card cf net ram; do
84 ln -sf /media/$d ${D}/mnt/$d 82 ln -sf /media/$d ${D}/mnt/$d
85 done 83 done
84 ln -snf ../run ${D}${localstatedir}/run
85 ln -snf ../run/lock ${D}${localstatedir}/lock
86 86
87 ${BASEFILESISSUEINSTALL} 87 ${BASEFILESISSUEINSTALL}
88 88
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 @@
21# This explains the order of "link before object" as in the example above, where 21# This explains the order of "link before object" as in the example above, where
22# a link will be created at /var/test pointing to /tmp/testfile and due to this 22# a link will be created at /var/test pointing to /tmp/testfile and due to this
23# link the file defined as /var/test will actually be created as /tmp/testfile. 23# link the file defined as /var/test will actually be created as /tmp/testfile.
24d root root 1777 /var/volatile/lock none 24d root root 1777 /run/lock none
25d root root 0755 /var/volatile/log none 25d root root 0755 /var/volatile/log none
26d root root 0755 /var/volatile/run none
27d root root 1777 /var/volatile/tmp none 26d root root 1777 /var/volatile/tmp none
28l root root 1777 /var/lock /var/volatile/lock 27l root root 1777 /var/lock /run/lock
29l root root 0755 /var/log /var/volatile/log 28l root root 0755 /var/log /var/volatile/log
30l root root 0755 /var/run /var/volatile/run 29l root root 0755 /var/run /run
31l root root 1777 /var/tmp /var/volatile/tmp 30l root root 1777 /var/tmp /var/volatile/tmp
32l root root 1777 /tmp /var/tmp 31l root root 1777 /tmp /var/tmp
33d root root 0755 /var/lock/subsys none 32d root root 0755 /var/lock/subsys none