Attachment 302441 Details for Bug 440568 – anaconda patch

[patch] anaconda patch

anaconda-fix-net-rules.patch (text/plain), 2.58 KB, created by David Woodhouse on 2008-04-15 12:15:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Woodhouse

Created: 2008-04-15 12:15:01 UTC

Size: 2.58 KB

patch

obsolete

>diff --git a/loader2/nfsinstall.c b/loader2/nfsinstall.c
>index 904bc39..5746f59 100644
>--- a/loader2/nfsinstall.c
>+++ b/loader2/nfsinstall.c
>@@ -230,18 +230,21 @@ char * mountNfsImage(struct installMethod * method,
>                     buf = strdup("/mnt/source/images/stage2.img");
>                 }
> 
>-                winStatus(70, 3, _("Retrieving"), "%s %s...", _("Retrieving"), buf);
>-                rc = copyFile(buf, "/tmp/stage2.img");
>-                newtPopWindow();
>+		rc = access(buf, R_OK);
> 
>                 if (!rc) {
>                     logMessage(INFO, "can access %s", buf);
>-                    rc = mountStage2("/tmp/stage2.img", stage2dir);
>+                    rc = mountStage2(buf, stage2dir);
>+
>+		    if (rc == 1) {
>+			    logMessage(WARNING, "unable to mount %s", buf);
>+			    goto trynfsiso;
>+		    }
> 
>                     free(buf);
>                     free(stage2dir);
> 
>-                    if (rc && rc == -1) {
>+                    if (rc == -1) {
>                         foundinvalid = 1;
>                         logMessage(WARNING, "not the right one");
>                         umount("/mnt/source");
>@@ -254,6 +257,7 @@ char * mountNfsImage(struct installMethod * method,
>                     char *path;
> 
>                     logMessage(WARNING, "unable to access %s", buf);
>+		trynfsiso:
>                     free(buf);
>                     free(stage2dir);
>                     umount("/mnt/source");
>diff --git a/network.py b/network.py
>index 1b26173..0b37b07 100644
>--- a/network.py
>+++ b/network.py
>@@ -554,12 +554,20 @@ class Network:
>             addr = dev.get("hwaddr")
>             if not addr:
>                 continue
>+            devname = dev.get("device")
>+            basename = devname
>+            while basename is not "" and basename[-1] in string.digits:
>+                basename = basename[:-1]
>+
>             # rules are case senstive for address. Lame.
>             addr = addr.lower()
>+
>             s = "" 
>             if len(dev.get("DESC")) > 0:
>-                s = "# %s\n" % (dev.get("DESC"),)
>-            s = s + 'SUBSYSTEM==\"net\", ACTION==\"add\", DRIVERS=="?*", ATTR{address}=="%s", ATTR{type}=="1", NAME="%s"\n' % (addr, dev.get("device"))
>-            f.write(s)
>+                s = "# %s (rule written by anaconda)\n" % (dev.get("DESC"),)
>+            else:
>+                s = "# %s (rule written by anaconda)\n" % (devname,)
>+            s = s + 'SUBSYSTEM==\"net\", ACTION==\"add\", DRIVERS=="?*", ATTR{address}=="%s", ATTR{type}=="1", KERNEL=="%s*", NAME="%s"\n' % (addr, basename, devname)
>+            print s
>         
>         f.close()

Actions: View | Diff

Attachments on bug 440568: 301462 | 301485 | 301740 | 301741 | 301786 | 302303 | 302312 | 302432 | 302441 | 302478