import ovirt-functions for autoinstall mode (sources /etc/default/ovirt)
send messages to both log and console
---
scripts/ovirt-config-networking | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/scripts/ovirt-config-networking b/scripts/ovirt-config-networking
index 0e84b29..6609d0a 100755
--- a/scripts/ovirt-config-networking
+++ b/scripts/ovirt-config-networking
@@ -3,6 +3,8 @@
# Iterates over the list of network devices on the node and prompts the user
# to configure each.
+. /etc/init.d/ovirt-functions
+
ME=$(basename "$0")
warn() { printf '%s: %s\n' "$ME" "$*" >&2; }
die() { warn "$*"; exit 1; }
@@ -157,7 +159,7 @@ function setup_menu
}
if [ "$1" == "AUTO" ]; then
- configure_interface $OVIRT_BOOTIF AUTO
+ configure_interface "$OVIRT_BOOTIF" AUTO
RESTART="Y"
else
setup_menu
@@ -181,5 +183,6 @@ if [ "$RESTART" == "Y" ]; then
{ cat "$WORKDIR"/augtool-* && printf "save\n";
} > $config \
&& augtool < $config \
&& service network restart
- } >> $CONFIG_LOG_FILE 2>&1
+ } 2>&1 | tee $CONFIG_LOG_FILE
+
fi
--
1.6.0.4
Darryl L. Pierce
2008-Dec-15 18:53 UTC
[Ovirt-devel] [PATCH node] ovirt-config-networking fixes
On Mon, Dec 15, 2008 at 06:47:20PM +0100, Alan Pevec wrote:> import ovirt-functions for autoinstall mode (sources /etc/default/ovirt) > send messages to both log and console > --- > scripts/ovirt-config-networking | 7 +++++-- > 1 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/scripts/ovirt-config-networking b/scripts/ovirt-config-networking > index 0e84b29..6609d0a 100755 > --- a/scripts/ovirt-config-networking > +++ b/scripts/ovirt-config-networking > @@ -3,6 +3,8 @@ > # Iterates over the list of network devices on the node and prompts the user > # to configure each. > > +. /etc/init.d/ovirt-functions > + > ME=$(basename "$0") > warn() { printf '%s: %s\n' "$ME" "$*" >&2; } > die() { warn "$*"; exit 1; } > @@ -157,7 +159,7 @@ function setup_menu > } > > if [ "$1" == "AUTO" ]; then > - configure_interface $OVIRT_BOOTIF AUTO > + configure_interface "$OVIRT_BOOTIF" AUTO > RESTART="Y" > else > setup_menu > @@ -181,5 +183,6 @@ if [ "$RESTART" == "Y" ]; then > { cat "$WORKDIR"/augtool-* && printf "save\n"; } > $config \ > && augtool < $config \ > && service network restart > - } >> $CONFIG_LOG_FILE 2>&1 > + } 2>&1 | tee $CONFIG_LOG_FILE > + > fi > -- > 1.6.0.4ACK. -- Darryl L. Pierce, Sr. Software Engineer @ Red Hat, Inc. Virtual Machine Management - http://www.ovirt.org/ "What do you care what other people think, Mr. Feynman?" -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 197 bytes Desc: not available URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20081215/580a4722/attachment.sig>