Fix kexec call

Fix the preparation of kexec call args.  kexec wants the param
and value in the same arg.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>

diff --git a/ui/common/ui-system.c b/ui/common/ui-system.c
index 3f54191bfd5671c4e92476353a30401a8741bab3..b252e9a98edbde407731bc0f29c85ddbadeeda9a 100644 (file)
--- a/ui/common/ui-system.c
+++ b/ui/common/ui-system.c
@@ -43,20 +43,24 @@ static int run_kexec_local(const char *l_image, const char *l_initrd,
        const char *args)
 {
        int result;
        const char *args)
 {
        int result;

-       const char *argv[8];
+       const char *argv[6];

        const char **p;
        const char **p;

+       char *s_initrd = NULL;
+       char *s_args = NULL;

 
        p = argv;
        *p++ = pb_system_apps.kexec;            /* 1 */
 
        if (l_initrd) {
 
        p = argv;
        *p++ = pb_system_apps.kexec;            /* 1 */
 
        if (l_initrd) {

-               *p++ = "--initrd";              /* 2 */
-               *p++ = l_initrd;                /* 3 */
+               s_initrd = talloc_asprintf(NULL, "--initrd=%s", l_initrd);
+               assert(s_initrd);
+               *p++ = s_initrd;                 /* 2 */

        }
 
        if (args) {
        }
 
        if (args) {

-               *p++ = "--append";              /* 4 */
-               *p++ = args;                    /* 5 */
+               s_args = talloc_asprintf(NULL, "--append=%s", args);
+               assert(s_args);
+               *p++ = s_args;                   /* 3 */

        }
 
        /* First try by telling kexec to run shutdown */
        }
 
        /* First try by telling kexec to run shutdown */


@@ -70,9 +74,9 @@ static int run_kexec_local(const char *l_image, const char *l_initrd,
        /* On error, force a kexec with the -f option */
 
        if (result) {
        /* On error, force a kexec with the -f option */
 
        if (result) {

-               *(p + 0) = "-f";                /* 6 */
-               *(p + 1) = l_image;             /* 7 */
-               *(p + 2) = NULL;                /* 8 */
+               *(p + 0) = "-f";                /* 4 */
+               *(p + 1) = l_image;             /* 5 */
+               *(p + 2) = NULL;                /* 6 */

 
                result = pb_run_cmd(argv);
        }
 
                result = pb_run_cmd(argv);
        }


@@ -80,6 +84,9 @@ static int run_kexec_local(const char *l_image, const char *l_initrd,
        if (result)
                pb_log("%s: failed: (%d)\n", __func__, result);
 
        if (result)
                pb_log("%s: failed: (%d)\n", __func__, result);
 

+       talloc_free(s_initrd);
+       talloc_free(s_args);
+

        return result;
 }
 
        return result;
 }