[PATCH 2/2] openvswitch: Ensure pki directory creation

[PATCH 2/2] openvswitch: Ensure pki directory creation

[Mihai Prica]

RPM doesn't guarantee the order in which postinstalls are ran.
Added code to ensure the pki directory is initialized.

Signed-off-by: Mihai Prica <mihai.prica@intel.com>
---
 .../openvswitch/openvswitch_1.10.0.bb              |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/recipes-networking/openvswitch/openvswitch_1.10.0.bb b/recipes-networking/openvswitch/openvswitch_1.10.0.bb
index fff597c..3703c1b 100644
--- a/recipes-networking/openvswitch/openvswitch_1.10.0.bb
+++ b/recipes-networking/openvswitch/openvswitch_1.10.0.bb
@@ -14,7 +14,7 @@ RDEPENDS_${PN}-pki = "${PN}"
 RDEPENDS_${PN}-brcompat = "${PN} ${PN}-switch"
 RRECOMMENDS_${PN} += "kernel-module-openvswitch"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://openvswitch.org/releases/openvswitch-${PV}.tar.gz \
 	file://openvswitch-switch \
@@ -91,6 +91,10 @@ pkg_postinst_${PN}-controller () {
                 exit 1
         fi
 
+    if test ! -d $D/${datadir}/${PN}/pki; then
+        ovs-pki init --dir=$D/${datadir}/${PN}/pki
+    fi
+
 	cd $D/${sysconfdir}/openvswitch-controller
         if ! test -e cacert.pem; then
             ln -s $D/${datadir}/${PN}/pki/switchca/cacert.pem cacert.pem
-- 
1.7.9.5

Re: [PATCH 2/2] openvswitch: Ensure pki directory creation

[Bruce Ashfield]

On Fri, Jul 26, 2013 at 10:06 AM, Mihai Prica <mihai.prica@intel.com> wrote:
> RPM doesn't guarantee the order in which postinstalls are ran.
> Added code to ensure the pki directory is initialized.

Looks good, and tested fine here. Again, sorry for the delay, this is
now merged.

Bruce

>
> Signed-off-by: Mihai Prica <mihai.prica@intel.com>
> ---
>  .../openvswitch/openvswitch_1.10.0.bb              |    6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/recipes-networking/openvswitch/openvswitch_1.10.0.bb b/recipes-networking/openvswitch/openvswitch_1.10.0.bb
> index fff597c..3703c1b 100644
> --- a/recipes-networking/openvswitch/openvswitch_1.10.0.bb
> +++ b/recipes-networking/openvswitch/openvswitch_1.10.0.bb
> @@ -14,7 +14,7 @@ RDEPENDS_${PN}-pki = "${PN}"
>  RDEPENDS_${PN}-brcompat = "${PN} ${PN}-switch"
>  RRECOMMENDS_${PN} += "kernel-module-openvswitch"
>
> -PR = "r1"
> +PR = "r2"
>
>  SRC_URI = "http://openvswitch.org/releases/openvswitch-${PV}.tar.gz \
>         file://openvswitch-switch \
> @@ -91,6 +91,10 @@ pkg_postinst_${PN}-controller () {
>                  exit 1
>          fi
>
> +    if test ! -d $D/${datadir}/${PN}/pki; then
> +        ovs-pki init --dir=$D/${datadir}/${PN}/pki
> +    fi
> +
>         cd $D/${sysconfdir}/openvswitch-controller
>          if ! test -e cacert.pem; then
>              ln -s $D/${datadir}/${PN}/pki/switchca/cacert.pem cacert.pem
> --
> 1.7.9.5
>
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"