[oe-commits] org.oe.dev quagga: Modify the package to use the volatiles system to create the

[lenehan commit]

quagga: Modify the package to use the volatiles system to create the
/var/run/quagga directory so that it'll exist after reboot on systems
that use a tmpfs /var.

Author: lenehan at openembedded.org
Branch: org.openembedded.dev
Revision: de7f242d3127fcf4d604bbb7402765ce361579ff
ViewMTN: http://monotone.openembedded.org/revision.psp?id=de7f242d3127fcf4d604bbb7402765ce361579ff
Files:
1
packages/quagga/files/volatiles.03_quagga
packages/quagga/quagga.inc
packages/quagga/quagga_0.99.4.bb
packages/quagga/quagga_0.99.6.bb
Diffs:

#
# mt diff -rd1066bdb3453bcea32942d9f9d70b30311cab218 -rde7f242d3127fcf4d604bbb7402765ce361579ff
#
# 
# 
# add_file "packages/quagga/files/volatiles.03_quagga"
#  content [986616941ab3d8b99c66894a20faaaebdb13334a]
# 
# patch "packages/quagga/quagga.inc"
#  from [bc4cf24f36b140de573efa944b188893e329d5f3]
#    to [97540635d1eca693013ddb9424b7e64c72a9093d]
# 
# patch "packages/quagga/quagga_0.99.4.bb"
#  from [51088b03dea6e9b8b83b60269698df0a4ee293c1]
#    to [6bb080986b233717d8447b6382017dbb5739d632]
# 
# patch "packages/quagga/quagga_0.99.6.bb"
#  from [9ce7b72790dd7a617bd8c3a1c28bdd512db81e6c]
#    to [9139a9889364c0f4524792c1fa389a6f00cfad75]
# 
============================================================
--- packages/quagga/files/volatiles.03_quagga	986616941ab3d8b99c66894a20faaaebdb13334a
+++ packages/quagga/files/volatiles.03_quagga	986616941ab3d8b99c66894a20faaaebdb13334a
@@ -0,0 +1,2 @@
+# <type> <owner> <group> <mode> <path> <linksource>
+d quagga quagga 0755 /var/run/quagga none
============================================================
--- packages/quagga/quagga.inc	bc4cf24f36b140de573efa944b188893e329d5f3
+++ packages/quagga/quagga.inc	97540635d1eca693013ddb9424b7e64c72a9093d
@@ -28,7 +28,8 @@ SRC_URI = "http://www.quagga.net/downloa
            file://quagga.init \
            file://quagga.default \
            file://watchquagga.init \
-           file://watchquagga.default"
+           file://watchquagga.default \
+           file://volatiles.03_quagga"
 
 inherit autotools update-rc.d
 
@@ -58,11 +59,13 @@ do_install () {
 
 do_install () {
         # Install init script and default settings
-        install -m 0755 -d ${D}${sysconfdir}/default ${D}${sysconfdir}/init.d ${D}${sysconfdir}/quagga
+        install -m 0755 -d ${D}${sysconfdir}/default ${D}${sysconfdir}/init.d \
+                           ${D}${sysconfdir}/quagga ${D}${sysconfdir}/default/volatiles
         install -m 0644 ${WORKDIR}/quagga.default ${D}${sysconfdir}/default/quagga
         install -m 0644 ${WORKDIR}/watchquagga.default ${D}${sysconfdir}/default/watchquagga
         install -m 0755 ${WORKDIR}/quagga.init ${D}${sysconfdir}/init.d/quagga
         install -m 0755 ${WORKDIR}/watchquagga.init ${D}${sysconfdir}/init.d/watchquagga
+        install -m 0644 ${WORKDIR}/volatiles.03_quagga  ${D}${sysconfdir}/default/volatiles/volatiles.03_quagga
         # Install quagga
         oe_runmake install DESTDIR=${D} prefix=${prefix} \
                 libexecdir=${libexecdir}/quagga \
@@ -88,6 +91,7 @@ FILES_${PN}             = "${bindir}/vty
 FILES_${PN}-watchquagga = "${libdir}/quagga/watchquagga ${sysconfdir}/default/watchquagga \
                            ${sysconfdir}/init.d/watchquagga"
 FILES_${PN}             = "${bindir}/vtysh ${libdir}/quagga/zebra /usr/lib/libzebra*.so.* \
+                           ${sysconfdir}/default/volatiles/volatiles.03_quagga \
                            ${sysconfdir}/quagga \
                            ${sysconfdir}/default/quagga ${sysconfdir}/init.d/quagga"
 
@@ -111,7 +115,10 @@ pkg_postinst_${PN} () {
 pkg_postinst_${PN} () {
         grep -q quagga: /etc/group || addgroup quagga
         grep -q quaggavty: /etc/group || addgroup quaggavty
-        grep -q quagga: /etc/passwd || adduser --disabled-password --home=/var/run/quagga/ --ingroup quagga -g "Quagga routing suite" quagga
+        grep -q quagga: /etc/passwd || \
+            adduser --disabled-password --home=/var/run/quagga/ --system \
+                    --ingroup quagga --no-create-home -g "Quagga routing suite" quagga                                            
+        /etc/init.d/populate-volatile.sh update
 }
 
 # Stop apps before uninstall
============================================================
--- packages/quagga/quagga_0.99.4.bb	51088b03dea6e9b8b83b60269698df0a4ee293c1
+++ packages/quagga/quagga_0.99.4.bb	6bb080986b233717d8447b6382017dbb5739d632
@@ -1,3 +1,3 @@
-PR = "r4"
+PR = "r5"
 
 require quagga.inc
============================================================
--- packages/quagga/quagga_0.99.6.bb	9ce7b72790dd7a617bd8c3a1c28bdd512db81e6c
+++ packages/quagga/quagga_0.99.6.bb	9139a9889364c0f4524792c1fa389a6f00cfad75
@@ -1,3 +1,3 @@
-PR = "r1"
+PR = "r2"
 
 require quagga.inc