[node-devel] [PATCH v2] Add network configure before dropping into emergency shell

[Mike Burns]

Hi Eli,

Just a couple things.

1.  Thanks for the patch!
2.  White space errors:  when applying the patch, I get whitespace
errors on line 25.  Not a big issue, but something to watch for.
3.  We use gerrit[1] for patches in ovirt-node.  Please use it for
future patch submissions.  I've submitted this patch (with whitespace
fixed) to gerrit already[2]. 

Mike

[1] http://ovirt.org/wiki/Working_with_gerrit.ovirt.org
[2] http://gerrit.ovirt.org/1759

On Thu, 2012-02-09 at 12:50 +0800, taget at linux.vnet.ibm.com wrote:
> From: Eli <taget at linux.vnet.ibm.com>
> 
> 	Configure network regardless of storage_auto status.
> ---
>  scripts/ovirt-auto-install.py |   19 ++++++++++++-------
>  1 files changed, 12 insertions(+), 7 deletions(-)
> 
> diff --git a/scripts/ovirt-auto-install.py b/scripts/ovirt-auto-install.py
> index bfd0a12..ceadcd1 100755
> --- a/scripts/ovirt-auto-install.py
> +++ b/scripts/ovirt-auto-install.py
> @@ -30,7 +30,19 @@ from ovirtnode.snmp import *
>  from ovirt_config_setup.collectd import *
>  
>  print "Performing automatic disk partitioning"
> +storage_auto_succ = 0
>  if storage_auto():
> +    stroage_auto_succ = 1
> +
> +# network configuration
> +print "Configuring Network"
> +if OVIRT_VARS["OVIRT_BOOTIF"] != "":
> +    network_auto()
> +
> +if OVIRT_VARS.has_key("OVIRT_HOSTNAME"):
> +    system("hostname %s" % OVIRT_VARS["OVIRT_HOSTNAME"])
> +
> +if stroage_auto_succ == 1: 
>      print "Completed automatic disk partitioning"
>      # store /etc/shadow if adminpw/rootpw are set, handled already in ovirt-early
>      file = open("/proc/cmdline")
> @@ -40,13 +52,6 @@ if storage_auto():
>          ovirt_store_config("/etc/passwd")
>          ovirt_store_config("/etc/shadow")
>      file.close()
> -    # network configuration
> -    print "Configuring Network"
> -    if OVIRT_VARS["OVIRT_BOOTIF"] != "":
> -        network_auto()
> -
> -    if OVIRT_VARS.has_key("OVIRT_HOSTNAME"):
> -        system("hostname %s" % OVIRT_VARS["OVIRT_HOSTNAME"])
>      #set ssh_passwd_auth
>      if OVIRT_VARS.has_key("OVIRT_SSH_PWAUTH"):
>          if self.ssh_passwd_status.value() == 1: