Attachment 673991 Details for Bug 892626 – Proposed patch

[patch] Proposed patch

patch.diff (text/plain), 5.02 KB, created by robert.vanleeuwen on 2013-01-07 13:05:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: robert.vanleeuwen

Created: 2013-01-07 13:05:42 UTC

Size: 5.02 KB

patch

obsolete

>diff --git a/openstack-nova-api b/openstack-nova-api
>index dd12bb6..560a175 100755
>--- a/openstack-nova-api
>+++ b/openstack-nova-api
>@@ -39,7 +39,7 @@ start() {
>     [ -x $exec ] || exit 5
>     [ -f $config ] || exit 6
>     echo -n $"Starting $prog: "
>-    daemon --user nova --pidfile $pidfile "$exec --config-file $config --logfile $logfile &>/dev/null & echo \$! > $pidfile"
>+    daemon --user nova --pidfile $pidfile "$exec --config-file $config &>/dev/null & echo \$! > $pidfile"
>     retval=$?
>     echo
>     [ $retval -eq 0 ] && touch $lockfile
>diff --git a/openstack-nova-cert b/openstack-nova-cert
>index 7ead60a..78a4892 100755
>--- a/openstack-nova-cert
>+++ b/openstack-nova-cert
>@@ -31,7 +31,7 @@ start() {
>     [ -x $exec ] || exit 5
>     [ -f $config ] || exit 6
>     echo -n $"Starting $prog: "
>-    daemon --user nova --pidfile $pidfile "$exec --config-file $config --logfile $logfile &>/dev/null & echo \$! > $pidfile"
>+    daemon --user nova --pidfile $pidfile "$exec --config-file $config &>/dev/null & echo \$! > $pidfile"
>     retval=$?
>     echo
>     [ $retval -eq 0 ] && touch $lockfile
>diff --git a/openstack-nova-compute b/openstack-nova-compute
>index 8ee9c69..42404d4 100755
>--- a/openstack-nova-compute
>+++ b/openstack-nova-compute
>@@ -47,7 +47,7 @@ start() {
>     [ -x $exec ] || exit 5
>     [ -f $config ] || exit 6
>     echo -n $"Starting $prog: "
>-    daemon --user nova --pidfile $pidfile "$exec --config-file $config --logfile $logfile &>/dev/null & echo \$! > $pidfile"
>+    daemon --user nova --pidfile $pidfile "$exec --config-file $config &>/dev/null & echo \$! > $pidfile"
>     retval=$?
>     echo
>     [ $retval -eq 0 ] && touch $lockfile
>diff --git a/openstack-nova-console b/openstack-nova-console
>index 50732ff..755ddbe 100755
>--- a/openstack-nova-console
>+++ b/openstack-nova-console
>@@ -31,7 +31,7 @@ start() {
>     [ -x $exec ] || exit 5
>     [ -f $config ] || exit 6
>     echo -n $"Starting $prog: "
>-    daemon --user nova --pidfile $pidfile "$exec --config-file $config --logfile $logfile &>/dev/null & echo \$! > $pidfile"
>+    daemon --user nova --pidfile $pidfile "$exec --config-file $config &>/dev/null & echo \$! > $pidfile"
>     retval=$?
>     echo
>     [ $retval -eq 0 ] && touch $lockfile
>diff --git a/openstack-nova-consoleauth b/openstack-nova-consoleauth
>index 40398cb..4c15548 100755
>--- a/openstack-nova-consoleauth
>+++ b/openstack-nova-consoleauth
>@@ -31,7 +31,7 @@ start() {
>     [ -x $exec ] || exit 5
>     [ -f $config ] || exit 6
>     echo -n $"Starting $prog: "
>-    daemon --user nova --pidfile $pidfile "$exec --config-file $config --logfile $logfile &>/dev/null & echo \$! > $pidfile"
>+    daemon --user nova --pidfile $pidfile "$exec --config-file $config &>/dev/null & echo \$! > $pidfile"
>     retval=$?
>     echo
>     [ $retval -eq 0 ] && touch $lockfile
>diff --git a/openstack-nova-metadata-api b/openstack-nova-metadata-api
>index 2c25f76..27f53bb 100755
>--- a/openstack-nova-metadata-api
>+++ b/openstack-nova-metadata-api
>@@ -31,7 +31,7 @@ start() {
>     [ -x $exec ] || exit 5
>     [ -f $config ] || exit 6
>     echo -n $"Starting $prog: "
>-    daemon --user nova --pidfile $pidfile "$exec --config-file $config --logfile $logfile &>/dev/null & echo \$! > $pidfile"
>+    daemon --user nova --pidfile $pidfile "$exec --config-file $config &>/dev/null & echo \$! > $pidfile"
>     retval=$?
>     echo
>     [ $retval -eq 0 ] && touch $lockfile
>diff --git a/openstack-nova-network b/openstack-nova-network
>index bda4419..e57e6b2 100755
>--- a/openstack-nova-network
>+++ b/openstack-nova-network
>@@ -45,7 +45,7 @@ start() {
>     [ -x $exec ] || exit 5
>     [ -f $config ] || exit 6
>     echo -n $"Starting $prog: "
>-    daemon --user nova --pidfile $pidfile "$exec --config-file $config --logfile $logfile &>/dev/null & echo \$! > $pidfile"
>+    daemon --user nova --pidfile $pidfile "$exec --config-file $config &>/dev/null & echo \$! > $pidfile"
>     retval=$?
>     echo
>     [ $retval -eq 0 ] && touch $lockfile
>diff --git a/openstack-nova-scheduler b/openstack-nova-scheduler
>index 072cfa9..8ec6f0b 100755
>--- a/openstack-nova-scheduler
>+++ b/openstack-nova-scheduler
>@@ -31,7 +31,7 @@ start() {
>     [ -x $exec ] || exit 5
>     [ -f $config ] || exit 6
>     echo -n $"Starting $prog: "
>-    daemon --user nova --pidfile $pidfile "$exec --config-file $config --logfile $logfile &>/dev/null & echo \$! > $pidfile"
>+    daemon --user nova --pidfile $pidfile "$exec --config-file $config &>/dev/null & echo \$! > $pidfile"
>     retval=$?
>     echo
>     [ $retval -eq 0 ] && touch $lockfile
>diff --git a/openstack-nova-xvpvncproxy b/openstack-nova-xvpvncproxy
>index 380397a..131f478 100755
>--- a/openstack-nova-xvpvncproxy
>+++ b/openstack-nova-xvpvncproxy
>@@ -31,7 +31,7 @@ start() {
>     [ -x $exec ] || exit 5
>     [ -f $config ] || exit 6
>     echo -n $"Starting $prog: "
>-    daemon --user nova --pidfile $pidfile "$exec --config-file $config --logfile $logfile &>/dev/null & echo \$! > $pidfile"
>+    daemon --user nova --pidfile $pidfile "$exec --config-file $config &>/dev/null & echo \$! > $pidfile"
>     retval=$?
>     echo
>     [ $retval -eq 0 ] && touch $lockfile

Actions: View | Diff

Attachments on bug 892626: 673991