Add reminder comment to lib/learning-switch.c.

[sliver-openvswitch.git] / utilities / ofp-pki.in

diff --git a/utilities/ofp-pki.in b/utilities/ofp-pki.in
index d347a15..7d51469 100755 (executable)
--- a/utilities/ofp-pki.in
+++ b/utilities/ofp-pki.in
@@ -1,11 +1,13 @@
-#! /bin/sh -e
+#! /bin/sh
+
+set -e
 
 pkidir='@PKIDIR@'
 command=
 prev=
 force=no
 batch=no
-log=ofp-pki.log
+log='@LOGDIR@/ofp-pki.log'
 keytype=rsa
 bits=2048
 for option; do
@@ -155,6 +157,10 @@ fi
 if test -z "$dsaparam"; then
     dsaparam=$pkidir/dsaparam.pem
 fi
+case $log in
+    /*) ;;
+    *) $log="$PWD/$log" ;;
+esac
 
 if test "$command" = "init"; then
     if test -e "$pkidir" && test "$force" != "yes"; then
@@ -456,15 +462,7 @@ glob() {
     fi
 }
 
-case $log in
-    /*)
-        exec 3>>$log || true
-        ;;
-    *)
-        exec 3>>$pkidir/$log || true
-        ;;
-esac
-
+exec 3>>$log || true
 if test "$command" = req; then
     one_arg
 
@@ -502,7 +500,7 @@ elif test "$command" = self-sign; then
     must_not_exist "$arg1-cert.pem"
 
     openssl x509 -in "$arg1-req.pem" -out "$arg1-cert.pem" \
-        -signkey "$arg1-privkey.pem" -req -text
+        -signkey "$arg1-privkey.pem" -req -text 2>&3
 elif test "$command" = ls; then
     check_type "$arg2"