Attachment 933819 Details for Bug 1136449 – Patch that fix the problem

[patch] Patch that fix the problem

anaconda-ps-umount_wrong_cd.patch (text/plain), 2.30 KB, created by Konstantin Volkov on 2014-09-02 15:05:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Konstantin Volkov

Created: 2014-09-02 15:05:09 UTC

Size: 2.30 KB

patch

obsolete

>diff -urN anaconda-13.21.215.orig/loader/cdinstall.c anaconda-13.21.215/loader/cdinstall.c
>--- anaconda-13.21.215.orig/loader/cdinstall.c	2014-09-02 17:05:04.245761843 +0400
>+++ anaconda-13.21.215/loader/cdinstall.c	2014-09-02 18:58:38.176786201 +0400
>@@ -381,6 +381,12 @@
>                 if (!access(stage2loc, R_OK)) {
>                     char *updpath;
> 
>+                    if (access("/mnt/stage2/.discinfo", R_OK) && !FL_RESCUE(flags)) {
>+                        logMessage(DEBUGLVL, "%s appears to be a boot.iso.", devices[i]->device);
>+                        umount(location);
>+                        continue;
>+                    }
>+
>                     if (mediaCheck)
>                         queryCDMediaCheck(devices[i]->device, location);
> 
>@@ -414,6 +420,7 @@
> 
>                     checked_asprintf(&retbuf, "cdrom://%s:%s",
>                                      devices[i]->device, location);
>+                    break;
>                 } else {
>                     /* this wasnt the CD we were looking for, clean up and */
>                     /* try the next CD drive                               */
>@@ -426,8 +433,8 @@
>             if (interactive) {
>                 char * buf;
> 
>-                checked_asprintf(&buf, _("The %s disc was not found in any of your "
>-                                         "CDROM drives. Please insert the %s disc "
>+                checked_asprintf(&buf, _("The %s Full Installation disc was not found in any of your "
>+                                         "CDROM drives. Please insert the %s Full Installation disc "
>                                          "and press %s to retry."),
>                                  getProductName(), getProductName(), _("OK"));
> 
>diff -urN anaconda-13.21.215.orig/loader/loader.c anaconda-13.21.215/loader/loader.c
>--- anaconda-13.21.215.orig/loader/loader.c	2014-09-02 17:05:04.324740141 +0400
>+++ anaconda-13.21.215/loader/loader.c	2014-09-02 18:58:04.620750863 +0400
>@@ -1349,12 +1349,6 @@
>                 sleep(3);
>                 newtPopWindow();
>             }
>-            else {
>-                logMessage(DEBUGLVL, "This appears to be a boot.iso.");
>-                umountStage2();
>-                free(url);
>-                url = NULL;
>-            }
>         }
> 
>         if (!loaderData->stage2Data && loaderData->instRepo) {

Actions: View | Diff

Attachments on bug 1136449: 933819