projects / packages / anaconda.git / blame
| Commit | Line | Data |
|---|---|---|
| 0eaedeea PZ |
1 | --- anaconda-11.4.1.27/loader2/loader.c~ 2008-08-27 01:39:53.000000000 +0200 |
| 2 | +++ anaconda-11.4.1.27/loader2/loader.c 2008-08-27 01:42:07.063163028 +0200 | |
| 3 | @@ -1136,7 +1136,7 @@ | |
| 4 | ||
| 5 | char *url = NULL, *ret = NULL, *devName = NULL, *kbdtype = NULL; | |
| 6 | static struct networkDeviceConfig netDev; | |
| 7 | - int i, rc, dir = 1; | |
| 8 | + int i, rc = LOADER_NOOP, dir = 1; | |
| 9 | int needsNetwork = 0, class = -1; | |
| 10 | int skipMethodDialog = 0, skipLangKbd = 0; | |
| 11 | ||
| 12 | --- anaconda-11.4.1.27/loader2/nfsinstall.c~ 2008-08-11 21:02:14.000000000 +0200 | |
| 13 | +++ anaconda-11.4.1.27/loader2/nfsinstall.c 2008-08-27 01:48:04.672161030 +0200 | |
| 14 | @@ -58,7 +58,7 @@ | |
| 15 | int rc; | |
| 16 | ||
| 17 | entries[0].text = _("NFS server name:"); | |
| 18 | - entries[0].value = &newServer; | |
| 19 | + entries[0].value = (const char **)(&newServer); | |
| 20 | entries[0].flags = NEWT_FLAG_SCROLL; | |
| 21 | ||
| 22 | if (asprintf(&entries[1].text, _("%s directory:"), | |
| 23 | @@ -67,7 +67,7 @@ | |
| 24 | abort(); | |
| 25 | } | |
| 26 | ||
| 27 | - entries[1].value = &newDir; | |
| 28 | + entries[1].value = (const char **)(&newDir); | |
| 29 | entries[1].flags = NEWT_FLAG_SCROLL; | |
| 30 | entries[2].text = NULL; | |
| 31 | entries[2].value = NULL; | |
| 32 | --- anaconda-11.4.1.27/loader2/net.c~ 2008-08-11 21:02:14.000000000 +0200 | |
| 33 | +++ anaconda-11.4.1.27/loader2/net.c 2008-08-27 01:50:47.849163064 +0200 | |
| 34 | @@ -290,8 +290,8 @@ | |
| 35 | } | |
| 36 | ||
| 37 | do { | |
| 38 | - struct newtWinEntry entry[] = { { N_("ESSID"), &essid, 0 }, | |
| 39 | - { N_("Encryption Key"), &wepkey, 0 }, | |
| 40 | + struct newtWinEntry entry[] = { { N_("ESSID"), (const char **)(&essid), 0 }, | |
| 41 | + { N_("Encryption Key"), (const char **)(&wepkey), 0 }, | |
| 42 | { NULL, NULL, 0 } }; | |
| 43 | ||
| 44 | rc = newtWinEntries(_("Wireless Settings"), buf, | |
| 45 | @@ -329,7 +329,7 @@ | |
| 46 | struct in_addr addr; | |
| 47 | struct in6_addr addr6; | |
| 48 | char * ns = ""; | |
| 49 | - struct newtWinEntry entry[] = { { N_("Nameserver IP"), &ns, 0 }, | |
| 50 | + struct newtWinEntry entry[] = { { N_("Nameserver IP"), (const char **)(&ns), 0 }, | |
| 51 | { NULL, NULL, 0 } }; | |
| 52 | ||
| 53 | do { | |
| 54 | @@ -1851,7 +1851,7 @@ | |
| 55 | char **deviceNames; | |
| 56 | char *ksMacAddr = NULL, *seconds = strdup("10"), *idstr = NULL; | |
| 57 | struct device **devs; | |
| 58 | - struct newtWinEntry entry[] = {{N_("Seconds:"), (char **) &seconds, 0}, | |
| 59 | + struct newtWinEntry entry[] = {{N_("Seconds:"), (const char **) &seconds, 0}, | |
| 60 | {NULL, NULL, 0 }}; | |
| 61 | ||
| 62 | devs = getDevices(DEVICE_NETWORK); | |
| 16e32ab2 PZ |
63 | --- anaconda-11.4.1.27/yuminstall.py~ 2008-08-11 21:02:14.000000000 +0200 |
| 64 | +++ anaconda-11.4.1.27/yuminstall.py 2008-08-27 01:50:47.849163064 +0200 | |
| 65 | @@ -1673,8 +1673,6 @@ | |
| 66 | anaconda.id.desktop.setDefaultRunLevel(5) | |
| 67 | break | |
| 68 | ||
| 69 | - for repo in self.ayum.repos.listEnabled(): | |
| 70 | - repo.dirCleanup() | |
| 71 | ||
| 72 | # expire yum caches on upgrade | |
| 73 | if anaconda.id.getUpgrade() and os.path.exists("%s/var/cache/yum" %(anaconda.rootPath,)): |