On 01/24/2012 03:31 AM, Onkar N Mahajan wrote:
>  From b6ccad7b2fcacbf53da6f130fddf1cf4e257640e Mon Sep 17 00:00:00 2001
> From: Onkar N Mahajan<[email protected]>
> Date: Tue, 24 Jan 2012 12:58:22 +0530
> Subject: [PATCH] Fix - Symlink path for Autotest in SUSE. Signed-off-by:
> Onkar N Mahajan<[email protected]>

Applied. However, once again, your patch came out messed up, so I had to 
re-create it manually:

https://github.com/autotest/autotest/commit/37d94e95bc1e315839f782328523c93aea9baecc

Please use git send-email instead.

> ---
> client/bin/harness_standalone.py |    7 ++++++-
> 1 files changed, 6 insertions(+), 1 deletions(-)
>
> diff --git a/client/bin/harness_standalone.py
> b/client/bin/harness_standalone.py
> index 4f07d22..3cfbed7 100644
> --- a/client/bin/harness_standalone.py
> +++ b/client/bin/harness_standalone.py
> @@ -6,6 +6,7 @@ The default interface as required for the standalone
> reboot helper.
> __author__ = """Copyright Andy Whitcroft 2007"""
>
> from autotest_lib.client.common_lib import utils, error
> +from autotest_lib.client.bin import utils
> import os, harness, shutil, logging
>
> class harness_standalone(harness.harness):
> @@ -47,8 +48,12 @@ class harness_standalone(harness.harness):
>               initdefault = '2'
>
>           try:
> +            vendor = utils.get_os_vendor()
>               service = '/etc/init.d/autotest'
> -            service_link = '/etc/rc%s.d/S99autotest' % initdefault
> +            if vendor == 'SUSE':
> +               service_link = '/etc/init.d/rc%s.d/S99autotest' %
> initdefault
> +            else:
> +               service_link = '/etc/rc%s.d/S99autotest' % initdefault
>               if os.path.islink(service):
>                   os.remove(service)
>               if os.path.islink(service_link):

_______________________________________________
Autotest mailing list
[email protected]
http://test.kernel.org/cgi-bin/mailman/listinfo/autotest

Reply via email to