diff options
| author | Jamie Lenehan <lenehan@twibble.org> | 2007-05-14 12:16:07 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-05-14 12:16:07 +0000 |
| commit | c1de33c618fb13452e40073d97f66b0c089315c3 (patch) | |
| tree | 4a34892814d3b55c5e31f0b00eb172c7ba46e25f /packages | |
| parent | 45de1cf1e067ad5b61e7da0c8bd17adce13298ae (diff) | |
basefiles, initscripts: make /var non-volatile, as discussed on the mailinglist
Diffstat (limited to 'packages')
37 files changed, 60 insertions, 57 deletions
diff --git a/packages/base-files/base-files/akita/fstab b/packages/base-files/base-files/akita/fstab index 0b64a3bc80..ba53cd6fd4 100644 --- a/packages/base-files/base-files/akita/fstab +++ b/packages/base-files/base-files/akita/fstab @@ -3,7 +3,7 @@ proc /proc proc defaults 0 0 /dev/hda1 /media/cf auto defaults,sync,noauto 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 # SD/MMC in kernel 2.4 diff --git a/packages/base-files/base-files/amsdelta/fstab b/packages/base-files/base-files/amsdelta/fstab index bf87f5f11b..0285a1f7e7 100644 --- a/packages/base-files/base-files/amsdelta/fstab +++ b/packages/base-files/base-files/amsdelta/fstab @@ -1,6 +1,6 @@ /dev/mtdblock4 / jffs2 defaults 1 1 proc /proc proc defaults 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 # we use a non-volatile ramdisk, see /etc/init.d/ramdisk tmpfs /media/ram tmpfs defaults 0 0 diff --git a/packages/base-files/base-files/armzone-qt2410/fstab b/packages/base-files/base-files/armzone-qt2410/fstab index d339f800d3..88d057c40d 100644 --- a/packages/base-files/base-files/armzone-qt2410/fstab +++ b/packages/base-files/base-files/armzone-qt2410/fstab @@ -6,7 +6,7 @@ proc /proc proc defaults 0 0 # usb? # Temporary -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 # SD/MMC diff --git a/packages/base-files/base-files/c7x0/fstab b/packages/base-files/base-files/c7x0/fstab index fb37e07aec..03945ca81b 100644 --- a/packages/base-files/base-files/c7x0/fstab +++ b/packages/base-files/base-files/c7x0/fstab @@ -3,7 +3,7 @@ proc /proc proc defaults 0 0 /dev/hda1 /media/cf auto defaults,sync,noauto 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 # SD/MMC in kernel 2.4 diff --git a/packages/base-files/base-files/collie/fstab b/packages/base-files/base-files/collie/fstab index ce5bc3bac5..cbb38d1831 100644 --- a/packages/base-files/base-files/collie/fstab +++ b/packages/base-files/base-files/collie/fstab @@ -2,7 +2,7 @@ proc /proc proc defaults 0 0 /dev/hda1 /media/cf auto defaults,sync,noauto,noatime,user,exec,suid,gid=100,umask=0002 0 0 /dev/mmcda1 /media/card auto defaults,sync,noauto,noatime,user,exec,suid 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 # we use a non-volatile ramdisk, see /etc/init.d/ramdisk #tmpfs /media/ram tmpfs defaults 0 0 diff --git a/packages/base-files/base-files/efika/fstab b/packages/base-files/base-files/efika/fstab index ac92724dbc..8c79a60df9 100644 --- a/packages/base-files/base-files/efika/fstab +++ b/packages/base-files/base-files/efika/fstab @@ -2,4 +2,4 @@ rootfs / auto defaults 1 1 proc /proc proc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 usbfs /proc/bus/usb usbfs auto 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 diff --git a/packages/base-files/base-files/ep93xx/fstab b/packages/base-files/base-files/ep93xx/fstab index ac92724dbc..8c79a60df9 100644 --- a/packages/base-files/base-files/ep93xx/fstab +++ b/packages/base-files/base-files/ep93xx/fstab @@ -2,4 +2,4 @@ rootfs / auto defaults 1 1 proc /proc proc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 usbfs /proc/bus/usb usbfs auto 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 diff --git a/packages/base-files/base-files/epia/fstab b/packages/base-files/base-files/epia/fstab index 70f0b07353..83d673c8b5 100644 --- a/packages/base-files/base-files/epia/fstab +++ b/packages/base-files/base-files/epia/fstab @@ -1,4 +1,4 @@ /dev/ram0 / ext2 rw 1 1 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 proc /proc proc defaults 0 0 tmpfs /tmp tmpfs defaults 0 0 diff --git a/packages/base-files/base-files/fic-gta01/fstab b/packages/base-files/base-files/fic-gta01/fstab index 392422ea6f..2f4a38e703 100644 --- a/packages/base-files/base-files/fic-gta01/fstab +++ b/packages/base-files/base-files/fic-gta01/fstab @@ -7,7 +7,7 @@ proc /proc proc defaults 0 0 # Temporary tmpfs /tmp tmpfs defaults 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 # microSD slot diff --git a/packages/base-files/base-files/fstab b/packages/base-files/base-files/fstab index 00d0072a41..0720daf432 100644 --- a/packages/base-files/base-files/fstab +++ b/packages/base-files/base-files/fstab @@ -4,7 +4,7 @@ rootfs / auto defaults 1 1 proc /proc proc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 usbfs /proc/bus/usb usbfs defaults 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs defaults 0 0 tmpfs /media/ram tmpfs defaults 0 0 # uncomment this if your device has a SD/MMC/Transflash slot diff --git a/packages/base-files/base-files/h2200/fstab b/packages/base-files/base-files/h2200/fstab index 397da6c123..6b008b3834 100644 --- a/packages/base-files/base-files/h2200/fstab +++ b/packages/base-files/base-files/h2200/fstab @@ -1,6 +1,6 @@ /dev/mtdblock3 / jffs2 defaults 1 1 proc /proc proc defaults 0 0 sys /sys sysfs defaults 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 /dev/hda1 /media/cf auto defaults,sync,noauto,noatime,exec,suid 0 0 /dev/mmcblk0p1 /media/card auto defaults,sync,noauto,noatime,exec,suid 0 0 diff --git a/packages/base-files/base-files/h3600/fstab b/packages/base-files/base-files/h3600/fstab index 4228c15c00..d300b02566 100644 --- a/packages/base-files/base-files/h3600/fstab +++ b/packages/base-files/base-files/h3600/fstab @@ -2,5 +2,5 @@ proc /proc proc defaults 0 0 /dev/hda1 /media/cf auto defaults,noauto,noatime,user,exec,suid 0 0 /dev/mmc/part1 /media/card auto defaults,noauto,noatime,user,exec,suid 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 diff --git a/packages/base-files/base-files/h3900/fstab b/packages/base-files/base-files/h3900/fstab index 2a3929fd17..afa028bf90 100644 --- a/packages/base-files/base-files/h3900/fstab +++ b/packages/base-files/base-files/h3900/fstab @@ -4,5 +4,5 @@ proc /proc proc defaults 0 0 /dev/hda1 /media/cf auto defaults,noauto,noatime,user,exec,suid 0 0 /dev/mmc/part1 /media/card auto defaults,noauto,noatime,user,exec,suid 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 diff --git a/packages/base-files/base-files/h5000/fstab b/packages/base-files/base-files/h5000/fstab index 63711f989e..4ae3ad1344 100644 --- a/packages/base-files/base-files/h5000/fstab +++ b/packages/base-files/base-files/h5000/fstab @@ -4,5 +4,5 @@ proc /proc proc defaults 0 0 /dev/hda1 /media/cf auto defaults,noauto,noatime,user,exec,suid 0 0 /dev/mmcblk0p1 /media/card auto defaults,noauto,noatime,user,exec,suid 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 diff --git a/packages/base-files/base-files/h6300/fstab b/packages/base-files/base-files/h6300/fstab index 6884b4cc6d..f2eeb25b36 100644 --- a/packages/base-files/base-files/h6300/fstab +++ b/packages/base-files/base-files/h6300/fstab @@ -1,7 +1,7 @@ rootfs / auto defaults 1 1 proc /proc proc defaults 0 0 sys /sys sysfs defaults 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 #The devpts file system provides an interface to pseudo terminal (pty) devices. devpts /dev/pts devpts mode=0620,gid=5 0 0 #Mount first partition from the mmc card. diff --git a/packages/base-files/base-files/htcuniversal/fstab b/packages/base-files/base-files/htcuniversal/fstab index 21b2bb1360..1ec129e366 100644 --- a/packages/base-files/base-files/htcuniversal/fstab +++ b/packages/base-files/base-files/htcuniversal/fstab @@ -2,7 +2,7 @@ rootfs / auto defaults 1 1 proc /proc proc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 usbfs /proc/bus/usb usbfs defaults 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 # uncomment this if your device has a SD/MMC/Transflash slot diff --git a/packages/base-files/base-files/hx4700/fstab b/packages/base-files/base-files/hx4700/fstab index 3dfde917e6..1c90d577ac 100644 --- a/packages/base-files/base-files/hx4700/fstab +++ b/packages/base-files/base-files/hx4700/fstab @@ -5,5 +5,5 @@ proc /proc proc defaults 0 0 sys /sys sysfs defaults 0 0 /dev/hda1 /media/cf auto defaults,noauto,noatime,exec,suid 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 diff --git a/packages/base-files/base-files/jornada56x/fstab b/packages/base-files/base-files/jornada56x/fstab index 07ccff0fe6..65db0c94a3 100644 --- a/packages/base-files/base-files/jornada56x/fstab +++ b/packages/base-files/base-files/jornada56x/fstab @@ -1,6 +1,6 @@ /dev/mtdblock1 / jffs2 rw,noatime 1 1 proc /proc proc defaults 0 0 /dev/hda1 /mnt/cf auto defaults,sync,noauto 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /mnt/ram tmpfs defaults 0 0 devpts /dev/pts devpts defaults 0 0
\ No newline at end of file diff --git a/packages/base-files/base-files/jornada6xx/fstab b/packages/base-files/base-files/jornada6xx/fstab index 504a1a2f4e..22a3d30e71 100644 --- a/packages/base-files/base-files/jornada6xx/fstab +++ b/packages/base-files/base-files/jornada6xx/fstab @@ -2,6 +2,6 @@ proc /proc proc defaults 0 0 /dev/hda2 / ext2 defaults 0 0 /dev/hda1 /mnt/cf auto defaults,sync,noauto 0 0 /dev/hda3 none swap sw 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatiles tmpfs defaults 0 0 tmpfs /mnt/ram tmpfs defaults 0 0 -devpts /dev/pts devpts defaults 0 0
\ No newline at end of file +devpts /dev/pts devpts defaults 0 0 diff --git a/packages/base-files/base-files/jornada7xx/fstab b/packages/base-files/base-files/jornada7xx/fstab index 504a1a2f4e..22a3d30e71 100644 --- a/packages/base-files/base-files/jornada7xx/fstab +++ b/packages/base-files/base-files/jornada7xx/fstab @@ -2,6 +2,6 @@ proc /proc proc defaults 0 0 /dev/hda2 / ext2 defaults 0 0 /dev/hda1 /mnt/cf auto defaults,sync,noauto 0 0 /dev/hda3 none swap sw 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatiles tmpfs defaults 0 0 tmpfs /mnt/ram tmpfs defaults 0 0 -devpts /dev/pts devpts defaults 0 0
\ No newline at end of file +devpts /dev/pts devpts defaults 0 0 diff --git a/packages/base-files/base-files/mtx-1/fstab b/packages/base-files/base-files/mtx-1/fstab index ffab21cf68..06ba41dbb8 100644 --- a/packages/base-files/base-files/mtx-1/fstab +++ b/packages/base-files/base-files/mtx-1/fstab @@ -2,7 +2,7 @@ # # <file system> <mount pt> <type> <options> <dump> <pass> rootfs / auto defaults 1 1 -tmpfs /var tmpfs size=10m 0 0 +tmpfs /var/volatile tmpfs mode=0755,size=10m 0 0 proc /proc proc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 usbdevfs /proc/bus/usb usbdevfs noauto 0 0 diff --git a/packages/base-files/base-files/mtx-2/fstab b/packages/base-files/base-files/mtx-2/fstab index f6f23ac2aa..a8f96f81b0 100644 --- a/packages/base-files/base-files/mtx-2/fstab +++ b/packages/base-files/base-files/mtx-2/fstab @@ -2,7 +2,7 @@ # # <file system> <mount pt> <type> <options> <dump> <pass> rootfs / auto defaults 1 1 -tmpfs /var tmpfs size=10m 0 0 +tmpfs /var/volatile tmpfs mode=0755,size=10m 0 0 proc /proc proc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 usbdevfs /proc/bus/usb usbdevfs noauto 0 0 diff --git a/packages/base-files/base-files/netbook-pro/fstab b/packages/base-files/base-files/netbook-pro/fstab index ac92724dbc..8c79a60df9 100644 --- a/packages/base-files/base-files/netbook-pro/fstab +++ b/packages/base-files/base-files/netbook-pro/fstab @@ -2,4 +2,4 @@ rootfs / auto defaults 1 1 proc /proc proc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 usbfs /proc/bus/usb usbfs auto 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 diff --git a/packages/base-files/base-files/netvista/fstab b/packages/base-files/base-files/netvista/fstab index e235acaa27..f26a57d2cd 100644 --- a/packages/base-files/base-files/netvista/fstab +++ b/packages/base-files/base-files/netvista/fstab @@ -1,5 +1,5 @@ /dev/hdc2 / ext2 rw,noatime 1 1 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 proc /proc proc defaults 0 0 tmpfs /tmp tmpfs defaults 0 0 devfs /dev/devfs devfs defaults 0 0 diff --git a/packages/base-files/base-files/nokia770/fstab b/packages/base-files/base-files/nokia770/fstab index 40823df5fa..c68c4d4b43 100644 --- a/packages/base-files/base-files/nokia770/fstab +++ b/packages/base-files/base-files/nokia770/fstab @@ -1,6 +1,6 @@ rootfs / rootfs defaults,errors=remount-ro,noatime 0 0 /dev/mmcblk0p1 /media/card auto defaults,noauto,noatime,exec,suid 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 proc /proc proc defaults 0 0 usbfs /proc/bus/usb usbfs defaults 0 0 diff --git a/packages/base-files/base-files/omap5912osk/fstab b/packages/base-files/base-files/omap5912osk/fstab index 77331c0dac..988cf717b0 100644 --- a/packages/base-files/base-files/omap5912osk/fstab +++ b/packages/base-files/base-files/omap5912osk/fstab @@ -4,6 +4,6 @@ rootfs / auto defaults 1 1 proc /proc proc defaults 0 0 sysfs /sysfs sysfs defaults 0 0 tmpfs /dev tmpfs defaults 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 diff --git a/packages/base-files/base-files/openmn/fstab b/packages/base-files/base-files/openmn/fstab index a2e78a2011..c3629a4887 100644 --- a/packages/base-files/base-files/openmn/fstab +++ b/packages/base-files/base-files/openmn/fstab @@ -2,5 +2,5 @@ devfs /dev devfs defaults 0 0 proc /proc proc defaults 0 0 none /sys sysfs defaults 0 0 rootfs / rootfs rw 1 1 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /tmp tmpfs defaults 0 0 diff --git a/packages/base-files/base-files/poodle/fstab b/packages/base-files/base-files/poodle/fstab index 06b9672504..81de333ba7 100644 --- a/packages/base-files/base-files/poodle/fstab +++ b/packages/base-files/base-files/poodle/fstab @@ -9,5 +9,5 @@ proc /proc proc defaults 0 0 # SD/MMC in kernel 2.4 /dev/mmcda1 /media/card auto defaults,sync,noauto 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 diff --git a/packages/base-files/base-files/simpad/fstab b/packages/base-files/base-files/simpad/fstab index 51aaaf9256..c9f82ca2e8 100644 --- a/packages/base-files/base-files/simpad/fstab +++ b/packages/base-files/base-files/simpad/fstab @@ -2,7 +2,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 /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 /dev/mtdblock/2 /home jffs2 defaults 1 1 /dev/hda1 /media/cf auto noauto,owner 0 0 diff --git a/packages/base-files/base-files/slugos/fstab b/packages/base-files/base-files/slugos/fstab index 0ac6b1460c..3f35e7a3a7 100644 --- a/packages/base-files/base-files/slugos/fstab +++ b/packages/base-files/base-files/slugos/fstab @@ -1,5 +1,5 @@ rootfs / jffs2 defaults 1 1 proc /proc proc defaults 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 usbfs /proc/bus/usb usbfs defaults 0 0 diff --git a/packages/base-files/base-files/spitz/fstab b/packages/base-files/base-files/spitz/fstab index a1fb3d4da1..8e667b63a5 100644 --- a/packages/base-files/base-files/spitz/fstab +++ b/packages/base-files/base-files/spitz/fstab @@ -4,7 +4,7 @@ rootfs / auto defaults 1 1 proc /proc proc defaults 0 0 # we can use a normal var filesystem with a microdrive -# tmpfs /var tmpfs defaults 0 0 +# tmpfs /var/volatiles tmpfs defaults 0 0 tmpfs /media/ram tmpfs defaults 0 0 # Compact Flash memory cards diff --git a/packages/base-files/base-files/tosa/fstab b/packages/base-files/base-files/tosa/fstab index 4a784180ca..b439abeb2c 100644 --- a/packages/base-files/base-files/tosa/fstab +++ b/packages/base-files/base-files/tosa/fstab @@ -3,7 +3,7 @@ proc /proc proc defaults 0 0 /dev/hda1 /media/cf auto defaults,sync,noauto 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 usbfs /proc/bus/usb usbfs auto 0 0 diff --git a/packages/base-files/base-files/wrt54/fstab b/packages/base-files/base-files/wrt54/fstab index c1e52f8927..3dce9b3ed1 100644 --- a/packages/base-files/base-files/wrt54/fstab +++ b/packages/base-files/base-files/wrt54/fstab @@ -2,6 +2,6 @@ # # <file system> <mount pt> <type> <options> <dump> <pass> rootfs / auto defaults 1 1 -tmpfs /var tmpfs size=50% 0 0 +tmpfs /var/volatile tmpfs mode=0755,size=50% 0 0 proc /proc proc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 diff --git a/packages/base-files/base-files/xxs1500/fstab b/packages/base-files/base-files/xxs1500/fstab index 7007ab021b..d4e2eff592 100644 --- a/packages/base-files/base-files/xxs1500/fstab +++ b/packages/base-files/base-files/xxs1500/fstab @@ -2,7 +2,7 @@ # # <file system> <mount pt> <type> <options> <dump> <pass> rootfs / auto defaults 1 1 -tmpfs /var tmpfs size=10m 0 0 +tmpfs /var/volatile tmpfs mode=0755,size=10m 0 0 proc /proc proc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 usbdevfs /proc/bus/usb usbdevfs noauto 0 0 diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb index 1e80f4c7f3..37068780fd 100644 --- a/packages/base-files/base-files_3.0.14.bb +++ b/packages/base-files/base-files_3.0.14.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Miscellaneous files for the base system." SECTION = "base" PRIORITY = "required" -PR = "r65" +PR = "r66" LICENSE = "GPL" SRC_URI = " \ @@ -25,7 +25,7 @@ SRC_URI = " \ S = "${WORKDIR}" docdir_append = "/${P}" -dirs1777 = "/tmp ${localstatedir}/lock ${localstatedir}/tmp" +dirs1777 = "/tmp ${localstatedir}/volatile/lock ${localstatedir}/volatile/tmp" dirs2775 = "/home ${prefix}/src ${localstatedir}/local" dirs755 = "/bin /boot /dev ${sysconfdir} ${sysconfdir}/default \ ${sysconfdir}/skel /lib /mnt /proc /home/root /sbin \ @@ -33,13 +33,16 @@ dirs755 = "/bin /boot /dev ${sysconfdir} ${sysconfdir}/default \ ${libdir} ${sbindir} ${datadir} \ ${datadir}/common-licenses ${datadir}/dict ${infodir} \ ${mandir} ${datadir}/misc ${localstatedir} \ - ${localstatedir}/backups ${localstatedir}/cache \ - ${localstatedir}/lib /sys ${localstatedir}/lib/misc \ - ${localstatedir}/lock/subsys ${localstatedir}/log \ - ${localstatedir}/run ${localstatedir}/spool \ + ${localstatedir}/backups ${localstatedir}/lib \ + /sys ${localstatedir}/lib/misc ${localstatedir}/spool \ + ${localstatedir}/volatile ${localstatedir}/volatile/cache \ + ${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" +volatiles = "cache run log lock tmp" conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \ ${sysconfdir}/inputrc ${sysconfdir}/issue /${sysconfdir}/issue.net \ ${sysconfdir}/nsswitch.conf ${sysconfdir}/profile \ @@ -64,6 +67,9 @@ do_install () { for d in ${dirs2775}; do install -m 2755 -d ${D}$d done + for d in ${volatiles}; do + ln -sf volatile/$d ${D}/${localstatedir}/$d + done for d in card cf net ram; do ln -sf /media/$d ${D}/mnt/$d done @@ -111,7 +117,6 @@ do_install () { do_install_append_mnci () { rmdir ${D}/tmp - mkdir -p ${D}${localstatedir}/tmp ln -s var/tmp ${D}/tmp } diff --git a/packages/initscripts/initscripts-1.0/volatiles b/packages/initscripts/initscripts-1.0/volatiles index 4320485663..3c680b2643 100644 --- a/packages/initscripts/initscripts-1.0/volatiles +++ b/packages/initscripts/initscripts-1.0/volatiles @@ -21,18 +21,16 @@ # 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 0775 /var none -d root root 0755 /var/backups none -d root root 0755 /var/cache none -d root root 0755 /var/lib none -d root root 0755 /var/lib/ipkg none -d root root 0755 /var/lib/misc none -d root root 2775 /var/local none -d root root 1777 /var/lock none +d root root 0755 /var/volatile/cache none +d root root 1777 /var/volatile/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 0755 /var/cache /var/volatile/cache +l root root 1777 /var/lock /var/volatile/lock +l root root 0755 /var/log /var/volatile/log +l root root 0755 /var/run /var/volatile/run +l root root 1777 /var/tmp /var/volatile/tmp d root root 0755 /var/lock/subsys none -d root root 0755 /var/log none -d root root 0755 /var/run none -d root root 0755 /var/spool none -d root root 1777 /var/tmp none -f root root 0664 /var/run/utmp none f root root 0664 /var/log/wtmp none +f root root 0664 /var/run/utmp none diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index 21e3bb2afe..d814e937db 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -4,7 +4,7 @@ PRIORITY = "required" DEPENDS = "makedevs" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r90" +PR = "r91" SRC_URI = "file://halt \ file://ramdisk \ |