anaconda-patches September 2012

anaconda-patches@lists.fedorahosted.org

15 participants
105 discussions

Start a nNew thread

Two very small patches
by David Lehman 26 Sep '12

26 Sep '12

First one fixes a threading bug, second fixes a thinko in my last set.

2 3

[PATCH] add boot-options.txt
by Will Woods 26 Sep '12

26 Sep '12

This is an asciidoc-format file that describes the various boot options accepted by anaconda (and dracut, and so on). --- docs/boot-options.txt | 413 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 413 insertions(+) create mode 100644 docs/boot-options.txt diff --git a/docs/boot-options.txt b/docs/boot-options.txt new file mode 100644 index 0000000..246260a --- /dev/null +++ b/docs/boot-options.txt @@ -0,0 +1,413 @@ +Anaconda Boot Options +===================== +Will Woods <wwoods(a)redhat.com> +:Revision: v17.0, June 6 2012: Rewrite for F17 changes. + +// written in asciidoc: http://www.methods.co.nz/asciidoc/ +// here's a few macros to improve readability in the text below.. +:dracutdoc: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut.html +:dracutkernel: {dracutdoc}#dracutcmdline7[`dracut.kernel(7)`] +:dracutnet: {dracutdoc}#_network[the "Network" section of `dracut.kernel(7)`] +:dracutdebug: {dracutdoc}#_troubleshooting[dracut "Troubleshooting" guide] +:fedoraboot: http://docs.fedoraproject.org/en-US/Fedora/16/html/Installation_Guide/ch-Bo… +:anacondalogging: https://fedoraproject.org/wiki/Anaconda/Logging + + +These are the boot options that are useful when starting Anaconda. For more +information on using Anaconda options, refer to {fedoraboot}["Appendix A. Boot +Options" in the _Fedora Installation Guide_]. + +Anaconda bootup is handled by dracut, so most of the kernel arguments handled +by dracut are also valid. See {dracutkernel} for details on those options. + +Throughout this guide, installer-specific options are prefixed with +`inst.` (e.g. `inst.ks`). The `inst` prefix is optional; `ks` still works +just fine. _The `inst` prefix may be required in a future release._ + +[[repo]] +Installation Source +------------------- + +.Installable Trees +[NOTE] +============================================================================== +An _installable tree_ is a directory structure containing installer +images, packages, and repodata. +footnote:[an installable tree must contain a valid `.treeinfo` file for +`inst.repo` or `inst.stage2` to work.] + +Usually this is either a copy of the DVD media (or loopback-mounted DVD +image), or the `<arch>/os/` directory on the Fedora mirrors. +============================================================================== + +=== inst.repo === +This gives the location of the _Install Source_ - that is, the place where the +installer can find its images and packages. It can be specified in a few +different ways: + +`inst.repo=cdrom`:: +Search the system's CDROM drives for installer media. _This is the default._ + +`inst.repo=cdrom:<device>`:: +Look for installer media in the specified disk device. + +`inst.repo=hd:<device>:<path>`:: +Mount the given disk partition and install from the given path. + +`inst.repo=[http,https,ftp]://<host>/<path>`:: +Look for an installable tree at the given URL. + +`inst.repo=nfs:[<options>:]<server>:/<path>`:: +Mount the given NFS server and path. Uses NFS version *3* by default. ++ +You can specify what version of the NFS protocol to use by adding +nfsvers=X+ +to the `options`. + +[[diskdev]] +.Disk Device Names +[NOTE] +====================================================================== +Disk devices may be specified with any of the following forms: + +Kernel Device Name:: + `/dev/sda1`, `sdb2` +Filesystem Label:: + `LABEL=FLASH`, `LABEL=Fedora`, `CDLABEL=Fedora\x2017\x20x86_64` +Filesystem UUID:: + `UUID=8176c7bf-04ff-403a-a832-9557f94e61db` + +Non-alphanumeric characters should be escaped with +\xNN+, where +'NN' is the hexidecimal representation of the character (e.g. +\x20+ for +the space character (' '). +====================================================================== + +=== inst.stage2 === +This specifies the location to fetch the _only_ the installer runtime image. +The packages will be ignored. Otherwise the same as `inst.repo`. + +*NOTE*: `inst.stage2` expects a _directory_ like `inst.repo`. If you need to +provide a URL to an _image_ to be used, try `root=live:<url>` instead. + +[[kickstart]] +Kickstart +--------- + +=== inst.ks === +Give the location of a kickstart file to be used to automate the install. Uses +the same formats as `inst.repo`. + +If `<path>` is omitted, `/ks.cfg` is assumed. + +If `inst.ks` is used without a value, the installer will look for +`nfs:<next_server>:/<filename>`: + +* `<next_server>` is the DHCP "next-server" option, or the IP of the DHCP server itself, +* `<filename>` is the DHCP "filename" option, or `/kickstart/`, and +* if the filename given ends in `/`, `<ip>-kickstart` is added +* example: +** DHCP server: `192.168.122.1` +** client address: `192.168.122.100` +*** kickstart file: `nfs:192.168.122.1:/kickstart/192.168.122.100-kickstart` + +==== inst.ks.sendmac ==== +Add headers to outgoing HTTP requests which include the MAC addresses of all +network interfaces. The headers are of the form: + +* `X-RHN-Provisioning-MAC-0: eth0 01:23:45:67:89:ab` + +This is helpful when using `inst.ks=http...` to provision systems. + +==== inst.ks.sendsn ==== +Add a header to outgoing HTTP requests which includes the system's serial +number. footnote:[as read from `/sys/class/dmi/id/product_serial`] +The header is of the form: + +* `X-System-Serial-Number: <serial>` + +[[network]] +Network Options +--------------- +Initial network setup is handled by dracut. For detailed information consult +{dracutnet}. + +The most common dracut network options are covered here, along with some +installer-specific options. + +=== ip === +Configure one (or more) network interfaces. You can use multiple `ip` +arguments to configure multiple interfaces, but if you do you must specify an +interface for _every_ `ip=` argument, *and* you must specify which interface +is the primary boot interface with `bootdev`. + +Accepts a few different forms; the most common are: + +`ip=<dhcp|dhcp6|auto6|ibft>`:: +Try to bring up *every interface* using the given autoconf method. _Defaults +to `ip=dhcp` if network is required by `inst.repo`, `inst.ks`, `inst.updates`, +etc._ + +`ip=<interface>:<autoconf>`:: +Bring up *only one interface* using the given autoconf method, e.g. +`ip=eth0:dhcp`. + +`ip=<ip>::<gateway>:<netmask>:<hostname>:<interface>:none`:: +Bring up the given interface with a static network config, where: + `<ip>`::: The client IP address. IPv6 addresses may be specified by putting + them in square brackets, like so: `[2001:DB8::1]`. + `<gateway>`::: The default gateway. IPv6 addresses are accepted here too. + `<netmask>`::: The netmask (e.g. `255.255.255.0`) or prefix (e.g. `64`). + `<hostname>`::: Hostname for the client machine. _Optional_. + +`ip=<ip>::<gateway>:<netmask>:<hostname>:<interface>:<autoconf>`:: +Bring up the given interface with the given autoconf method, but override the +automatically obtained IP/gateway/etc. with the provided values. ++ +Technically all of the items are optional, so if you want to use dhcp but also +set a hostname you can do `ip=::::<hostname>::dhcp`. + +=== nameserver === +Specify the address of a nameserver to use. _May be used multiple times._ + +=== bootdev === +Specify which interface is the boot device. _**Required** if multiple ip= +options are used._ + +=== ifname === +`ifname=<interface>:<MAC>`:: +Assign the given interface name to the network device with the given MAC. _May +be used multiple times._ + +=== inst.dhcpclass === +Set the DHCP vendor class identifier. (ISC `dhcpd` will see this value as +"option vendor-class-identifier"). + +_Defaults to `anaconda-$(uname -srm)`_. footnote:[For Fedora 17 this should be +something like 'anaconda-Linux 3.3.4-4.fc17.x86_64 x86_64'] + + +Console / Display Options +------------------------- + +[[console]] +=== console === +This is a kernel option that specifies what device to use as the primary +console. For example, if your console should be on the first serial port, use +`console=ttyS0`. + +You can use multiple `console=` options; boot message will be displayed on +all consoles, but anaconda will put its display on the _last_ console listed. + +Using this option implies `text`. + +=== inst.lang === +Set the language to be used during installation. This should be a language +that's valid for use with the `lang` kickstart command. + +=== inst.keymap === +Set the keyboard layout to use. This should be something valid for use with +the `keyboard` kickstart command. + +=== inst.cmdline === +Force command line install mode. This mode simply prints out text and does not +allow any interaction. All options must be specified in a kickstart or on the +command line. + +=== inst.graphical === +Make the installer to run in graphical mode. _This is the default._ + +=== inst.text === +Force the installer to use a very limited text-based UI. Unless you're using a +kickstart this probably isn't a good idea; you should use VNC instead. + +=== inst.vnc === +Run the installer GUI in a VNC session. You will need a VNC client application +to interact with the installer. VNC sharing is enabled, so multiple clients +may connect. + +A system installed with VNC will start in text mode (runlevel 3). + +_Consider setting a vnc password_ (see below). + +==== inst.vncpassword ==== +Set a password on the VNC server used by the installer. + +==== inst.vncconnect ==== +`inst.vncconnect=<host>[:<port>]`:: +Once the install starts, connect to a listening VNC client at the given host. +Default port is 5900. ++ +Use with `vncviewer -listen`. + +=== inst.headless === +Specify that the machine being installed onto doesn't have any display +hardware, and that anaconda shouldn't bother looking for it. + +=== inst.xdriver === +Specify the X driver that should be used during installation and on the +installed system. + +=== inst.usefbx === +Use the framebuffer X driver (`fbdev`) rather than a hardware-specific driver. + +Equivalent to `inst.xdriver=fbdev`. + +=== inst.sshd === +Start up `sshd` during system installation. You can then ssh in while the +installation progresses to debug or monitor its progress. + +*NOTE*: The `root` account has _no password by default_. You can set one using +the `sshpw` kickstart command. + +Debugging and Troubleshooting +----------------------------- + +=== inst.mediacheck === +Verify the installer media before starting the install. + +=== inst.rescue === +Run the rescue environment. This is useful for trying to diagnose and fix +broken systems. + +=== inst.updates === +Give the location of an `updates.img` to be applied to the installer runtime. +Takes the same arguments as `inst.repo` and `inst.ks`. + +If no `<path>` is given, `/updates.img` is assumed. + +=== inst.loglevel === +`inst.loglevel=<debug|info|warning|error|critical>`:: +Set the minimum level required for messages to be logged on a terminal (log +files always contain messages of all levels). The default value is `info`. + +=== inst.syslog === +`inst.syslog=<host>[:<port>]`:: +Once installation is running, send log messages to the syslog process on +the given host. The default port is 514 (UDP). ++ +Requires the remote syslog process to accept incoming connections. + +=== inst.virtiolog === +Forward logs through the named virtio port (a character device at +`/dev/virtio-ports/<name>`). A port named `org.fedoraproject.anaconda.log.0` +will be used by default, if found. ++ +For more information see {anacondalogging}. + +=== inst.autostep === +Normally, if the information needed by a given installer screen has +already been provided, the installer will skip that screen (for example, if +you specify `lang=en`, the language screen is skipped.) + +This option forces the installer to display those screens briefly before +stepping through to the next one. + +This is mostly used with the `autoscreenshot` kickstart command to get +automated screenshots of the installer. + +=== inst.debug === +Use `inst.debug=1` to add a "debug" button to the UI, which allows dropping +into a Python debugger. + +=== inst.traceback === +Intentionally raise an exception to make the installer crash with a traceback. +This is for testing our crash-handling code. _Don't use it unless you want the +installer to crash._ + +=== inst.upgradeany === +Normally the installer does a sanity check of `/etc/redhat-release` and +refuses to upgrade anything too old for it to handle. You can use this to +force it to upgrade anyway. _Use at your own risk._ + +Deprecated Options +------------------ + +These options should _still be accepted by the installer_, but they're +deprecated and may be removed soon. + +=== method === +This is just an alias for `inst.repo`. + +=== repo=nfsiso:... === +The difference between an installable tree and a dir with an `.iso` file is +autodetected, so this is the same as `inst.repo=nfs:`... + +=== dns === +Use `nameserver` instead. Note that `nameserver` does not take comma-separated +lists; just use multiple `nameserver` options. + +=== netmask, gateway, hostname === +These can be provided as part of the <<network,`ip`>> option. + +=== ip=bootif === +A PXE-supplied BOOTIF option will be used automatically, so there's no need +for this. + +=== blacklist, nofirewire === + +`modprobe` handles blacklisting kernel modules on its own; try +`modprobe.blacklist=<mod1>,<mod2>...` + +You can blacklist the firewire module with `modprobe.blacklist=firewire_ohci`. + +Removed Options +--------------- + +These options are obsolete and have been removed. + +=== askmethod, asknetwork === +Anaconda's initramfs is now is completely non-interactive, so these have been +removed. + +Instead, specify a <<repo,repo>> or use appropriate <<network,network>> +options. + +=== serial === +This option was never intended for public use; it was supposed to be used to +force anaconda to use `/dev/ttyS0` as its console when testing it on a live +machine. + +Use `console=ttyS0` or similar instead. See <<console,console>> for details. + +=== updates === +Plain `updates` is no longer supported. Use `inst.updates=hd:<dev>[:<img>]`, +discussed above. + +=== ksdevice=link === +This is the default behavior when using ip autoconf. + +=== essid, wepkey, wpakey === +Dracut doesn't support wireless networking, so these don't do anything. + +=== ethtool === +Who needs to force half-duplex 10-base-T anymore? + +=== gdb === +This was used to debug `loader`, so it has been removed. There are plenty of +options for debugging dracut-based initramfs - see the {dracutdebug}. + +=== ks=floppy === +We no longer support floppy drives. Try `ks=hd:<device>` instead. + +=== display === +For remote display of the UI, use `inst.vnc`. + +=== utf8 === +All this option actually did was set `TERM=vt100`. The default `TERM` setting +works fine these days, so this was no longer necessary. + +=== noipv6 === +ipv6 is built into the kernel and can't be removed. You should be able to +disable it with `ipv6.disable`, though. + +Future Options +-------------- +These options are not present in Fedora 17 but will return in a future +version. + +=== dd, driverdisk === +Support for Driver Update Disks will return in Fedora 18. + +=== proxy === +Support for commandline-configured network proxies will return in Fedora 18. + +// vim: set tw=78 syntax=asciidoc: -- 1.7.11.4

2 1

Enable reuse of existing devices in custom spoke
by David Lehman 26 Sep '12

26 Sep '12

Most of the horror is in patch 10. Patches 1, 5, and 11 are all noteworthy on their own.

3 18

[PATCH rhel6-branch] Fix handling of non-valid nameserver ips (#795535)
by Radek Vykydal 26 Sep '12

26 Sep '12

Ignore them instead of looping infinitely. Thanks to Brian for review. Related: rhbz#795535 --- loader/net.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/loader/net.c b/loader/net.c index 41881ab..30856bb 100644 --- a/loader/net.c +++ b/loader/net.c @@ -2593,26 +2593,23 @@ void parseDnsServers(const char *dnss, iface_t *iface) { c = strtok(buf, ","); while ((iface->numdns < MAXNS) && (c != NULL)) { if (inet_pton(AF_INET, c, &addr) >= 1) { - iface->dns[iface->numdns] = strdup(c); - iface->numdns++; - if (inet_ntop(AF_INET, &addr, ret, INET_ADDRSTRLEN) == NULL) { logMessage(ERROR, "%s (%d): %s", __func__, __LINE__, strerror(errno)); } else { logMessage(DEBUGLVL, "adding dns4 %s", ret); - c = strtok(NULL, ","); + iface->dns[iface->numdns] = strdup(c); + iface->numdns++; } } else if (inet_pton(AF_INET6, c, &addr6) >= 1) { - iface->dns[iface->numdns] = strdup(c); - iface->numdns++; - if (inet_ntop(AF_INET6, &addr6, ret, INET6_ADDRSTRLEN) == NULL) { logMessage(ERROR, "%s (%d): %s", __func__, __LINE__, strerror(errno)); } else { logMessage(DEBUGLVL, "adding dns6 %s", ret); - c = strtok(NULL, ","); + iface->dns[iface->numdns] = strdup(c); + iface->numdns++; } } + c = strtok(NULL, ","); } } -- 1.7.4

2 1

[master] Patches for installation with live system
by Vratislav Podzimek 26 Sep '12

26 Sep '12

This patch set changes DateTime and Keyboard spokes not to modify live system during liveCD and image installations or during testing. It does not contain any changes related to saving/restoring HW clock as we don't have such code in master yet. Depending on which patches get pushed first I'll add changes that will make HW clock operations not modify live system or change HW clock patches directly. PATCH 1/3 introduces function, that can be used to check if we can modify live system. It saves some typing, adds logging and facilitates testing. PATCH 2/3 uses the newly add function for DateTime spoke actions. PATCH 3/3 uses the newly add function for Keyboard spoke actions. Question is what to do with the layout testing area. At this point, the patch only makes it insensitive, but we may possibly hide it completely. Suggestions? Vratislav Podzimek (3): Add a guard for testing if we can modify live system Make DateTime spoke live-system friendly Make Keboard spoke live-system friendly pyanaconda/flags.py | 27 +++++++++++++++ pyanaconda/ui/gui/spokes/datetime_spoke.py | 55 +++++++++++++++++++++++------- pyanaconda/ui/gui/spokes/keyboard.glade | 6 ++-- pyanaconda/ui/gui/spokes/keyboard.py | 25 +++++++++++--- 4 files changed, 93 insertions(+), 20 deletions(-) -- 1.7.11.4

2 10

[master] [PATCH] Change testing area label to something more appropriate (KeyboardSpoke)
by Vratislav Podzimek 26 Sep '12

26 Sep '12

As we are not switching layouts on selection changes we shouldn't state that in the label commenting the testing area. Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- pyanaconda/ui/gui/spokes/keyboard.glade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyanaconda/ui/gui/spokes/keyboard.glade b/pyanaconda/ui/gui/spokes/keyboard.glade index 1919a14..b1554bd 100644 --- a/pyanaconda/ui/gui/spokes/keyboard.glade +++ b/pyanaconda/ui/gui/spokes/keyboard.glade @@ -392,7 +392,7 @@ any layout to the top of the list to select it as the default.</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">Test the selected layout below:</property> + <property name="label" translatable="yes">Test layout configuration below:</property> </object> <packing> <property name="expand">False</property> -- 1.7.11.4

1 0

[PATCH rhel6-branch] Support multiple nameservers in loader TUI (#795535)
by Radek Vykydal 26 Sep '12

26 Sep '12

Comma separated as in kickstart and boot options. Resolves: rhbz#795535 --- loader/net.c | 98 +++++++++++++++++++++++++++++---------------------------- loader/net.h | 2 +- 2 files changed, 51 insertions(+), 49 deletions(-) diff --git a/loader/net.c b/loader/net.c index e8c4b43..41881ab 100644 --- a/loader/net.c +++ b/loader/net.c @@ -279,7 +279,6 @@ int split_bond_option(char *str, char **bondname, char **bondslaves, char **opti void setupIfaceStruct(iface_t * iface, struct loaderData_s * loaderData) { struct in_addr addr; struct in6_addr addr6; - char * c; memset(&addr, 0, sizeof(addr)); memset(&addr6, 0, sizeof(addr6)); @@ -369,39 +368,8 @@ void setupIfaceStruct(iface_t * iface, struct loaderData_s * loaderData) { #endif if (loaderData->dns) { - char * buf; - char ret[INET6_ADDRSTRLEN+1]; - buf = strdup(loaderData->dns); - - /* Scan the dns parameter for multiple comma-separated IP addresses */ - c = strtok(buf, ","); - while ((iface->numdns < MAXNS) && (c != NULL)) { - if (inet_pton(AF_INET, c, &addr) >= 1) { - iface->dns[iface->numdns] = strdup(c); - iface->numdns++; - - if (inet_ntop(AF_INET, &addr, ret, INET_ADDRSTRLEN) == NULL) { - logMessage(ERROR, "%s (%d): %s", __func__, __LINE__, strerror(errno)); - } else { - logMessage(DEBUGLVL, "adding dns4 %s", ret); - c = strtok(NULL, ","); - } - } else if (inet_pton(AF_INET6, c, &addr6) >= 1) { - iface->dns[iface->numdns] = strdup(c); - iface->numdns++; - - if (inet_ntop(AF_INET6, &addr6, ret, INET6_ADDRSTRLEN) == NULL) { - logMessage(ERROR, "%s (%d): %s", __func__, __LINE__, strerror(errno)); - } else { - logMessage(DEBUGLVL, "adding dns6 %s", ret); - c = strtok(NULL, ","); - } - } - } - - - logMessage(INFO, "dnsservers is %s", loaderData->dns); + parseDnsServers(loaderData->dns, iface); } if (loaderData->domain) { @@ -803,9 +771,7 @@ int manualNetConfig(char * device, iface_t * iface, int i, rows, pos, cidr, have[2], stack[2]; char *buf = NULL; char ret[48]; - struct in_addr addr; #ifdef ENABLE_IPV6 - struct in6_addr addr6; int prefix; #endif struct in_addr *tmpaddr = NULL; @@ -1007,9 +973,15 @@ int manualNetConfig(char * device, iface_t * iface, } if (iface->numdns) { - newtEntrySet(ipcomps->nsEntry, iface->dns[0], 1); - } else if (iface->numdns) { - newtEntrySet(ipcomps->nsEntry, iface->dns[0], 1); + gchar *dnss, *d = NULL; + dnss = g_strdup(iface->dns[0]); + for (i = 1; i < iface->numdns; i++) { + d = g_strjoin(",", dnss, iface->dns[i], NULL); + g_free(dnss); + dnss = d; + } + newtEntrySet(ipcomps->nsEntry, dnss, 1); + g_free(dnss); } newtComponentAddCallback(ipcomps->gwEntry, ipCallback, ipcomps); @@ -1140,16 +1112,8 @@ int manualNetConfig(char * device, iface_t * iface, /* gather nameservers */ if (ipcomps->ns) { -#ifdef ENABLE_IPV6 - if ((inet_pton(AF_INET, ipcomps->ns, &addr) >= 1) || - (inet_pton(AF_INET6, ipcomps->ns, &addr6) >= 1)) { -#else - if (inet_pton(AF_INET, ipcomps->ns, &addr) >= 1) { -#endif - iface->dns[0] = strdup(ipcomps->ns); - if (iface->numdns < 1) - iface->numdns = 1; - } + iface->numdns = 0; + parseDnsServers(ipcomps->ns, iface); } /* user selected back, but we've saved what they entered already */ @@ -2614,4 +2578,42 @@ int isURLRemote(char *url) { } } +void parseDnsServers(const char *dnss, iface_t *iface) { + char * buf, *c; + char ret[INET6_ADDRSTRLEN+1]; + buf = strdup(dnss); + struct in_addr addr; + struct in6_addr addr6; + + memset(&addr, 0, sizeof(addr)); + memset(&addr6, 0, sizeof(addr6)); + + + /* Scan the dns parameter for multiple comma-separated IP addresses */ + c = strtok(buf, ","); + while ((iface->numdns < MAXNS) && (c != NULL)) { + if (inet_pton(AF_INET, c, &addr) >= 1) { + iface->dns[iface->numdns] = strdup(c); + iface->numdns++; + + if (inet_ntop(AF_INET, &addr, ret, INET_ADDRSTRLEN) == NULL) { + logMessage(ERROR, "%s (%d): %s", __func__, __LINE__, strerror(errno)); + } else { + logMessage(DEBUGLVL, "adding dns4 %s", ret); + c = strtok(NULL, ","); + } + } else if (inet_pton(AF_INET6, c, &addr6) >= 1) { + iface->dns[iface->numdns] = strdup(c); + iface->numdns++; + + if (inet_ntop(AF_INET6, &addr6, ret, INET6_ADDRSTRLEN) == NULL) { + logMessage(ERROR, "%s (%d): %s", __func__, __LINE__, strerror(errno)); + } else { + logMessage(DEBUGLVL, "adding dns6 %s", ret); + c = strtok(NULL, ","); + } + } + } +} + /* vim:set shiftwidth=4 softtabstop=4: */ diff --git a/loader/net.h b/loader/net.h index 1d09684..7f9e57c 100644 --- a/loader/net.h +++ b/loader/net.h @@ -90,5 +90,5 @@ int enable_NM_BOND_VLAN(void); int split_bond_option(char *str, char **bondname, char **bondslaves, char **options); int networkDeviceExists(char *name); int writeBondSlaveIfcfgFile(char *slave, char *master); - +void parseDnsServers(const char *dnss, iface_t *iface); #endif -- 1.7.4

3 3

[PATCH] add noverifyssl to anaconda-dracut (#852229)
by Brian C. Lane 25 Sep '12

25 Sep '12

From: "Brian C. Lane" <bcl(a)redhat.com> --- dracut/anaconda-netroot.sh | 1 + dracut/fetch-kickstart-net.sh | 2 ++ dracut/parse-anaconda-options.sh | 3 +++ 3 files changed, 6 insertions(+) diff --git a/dracut/anaconda-netroot.sh b/dracut/anaconda-netroot.sh index 0425661..6c04f3f 100755 --- a/dracut/anaconda-netroot.sh +++ b/dracut/anaconda-netroot.sh @@ -46,6 +46,7 @@ case $repo in ;; http*|ftp*) . /lib/url-lib.sh + getargbool 0 noverifyssl inst.noverifyssl && curl_args+=" --insecure" info "anaconda fetching installer from $repo" treeinfo=$(fetch_url $repo/.treeinfo) && \ stage2=$(config_get stage2 mainimage < $treeinfo) diff --git a/dracut/fetch-kickstart-net.sh b/dracut/fetch-kickstart-net.sh index 274071d..0510f43 100755 --- a/dracut/fetch-kickstart-net.sh +++ b/dracut/fetch-kickstart-net.sh @@ -21,6 +21,8 @@ command -v getarg >/dev/null || . /lib/dracut-lib.sh . /lib/url-lib.sh . /lib/anaconda-lib.sh +getargbool 0 noverifyssl inst.noverifyssl && curl_args+=" --insecure" + if [ "$kickstart" = "nfs:auto" ]; then # construct kickstart URL from dhcp info # server is next_server, or the dhcp server itself if missing diff --git a/dracut/parse-anaconda-options.sh b/dracut/parse-anaconda-options.sh index 2fb82a3..aef372d 100755 --- a/dracut/parse-anaconda-options.sh +++ b/dracut/parse-anaconda-options.sh @@ -84,6 +84,9 @@ check_removed_arg nousb "USB drivers can't be disabled." # ethtool is gone. Who forces their devices to single-duplex anymore? check_removed_arg ethtool +# Ignore self-signed SSL certs +check_renamed_arg "noverifyssl" "inst.noverifyssl" + # interactive junk in initramfs # (maybe we'll bring it back someday?) check_removed_arg askmethod "Use an appropriate 'inst.repo=' argument instead." -- 1.7.11.4

1 0

[PATCH 1/2] Remove compssort.py.
by Chris Lumens 25 Sep '12

25 Sep '12

It's unused anymore and clutters my grep results. --- pyanaconda/compssort.py | 69 ------------------------------------------------ pyanaconda/yuminstall.py | 1 - 2 files changed, 70 deletions(-) delete mode 100644 pyanaconda/compssort.py diff --git a/pyanaconda/compssort.py b/pyanaconda/compssort.py deleted file mode 100644 index 3ad9795..0000000 --- a/pyanaconda/compssort.py +++ /dev/null @@ -1,69 +0,0 @@ -# -# compssort.py -# -# Copyright (C) 2005, 2006, 2007 Red Hat, Inc. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# - -import os - -import gettext -_ = lambda x: gettext.ldgettext("anaconda", x) - -def _getDefaultLangs(): - languages = [] - for envar in ('LANGUAGE', 'LC_ALL', 'LC_MESSAGES', 'LANG'): - val = os.environ.get(envar) - if val: - languages = val.split(':') - break - if 'C' not in languages: - languages.append('C') - - # now normalize and expand the languages - nelangs = [] - for lang in languages: - for nelang in gettext._expand_lang(lang): - if nelang not in nelangs: - nelangs.append(nelang) - return nelangs - -# kind of lame caching of translations so we don't always have -# to do all the looping -strs = {} -def xmltrans(base, thedict): - if strs.has_key(base): - return strs[base] - - langs = _getDefaultLangs() - for l in langs: - if thedict.has_key(l): - strs[base] = thedict[l] - return strs[base] - strs[base] = base - return base - -def ui_comps_sort(one, two): - if one.display_order > two.display_order: - return 1 - elif one.display_order < two.display_order: - return -1 - elif xmltrans(one.name, one.translated_name) > \ - xmltrans(two.name, two.translated_name): - return 1 - elif xmltrans(one.name, one.translated_name) < \ - xmltrans(two.name, two.translated_name): - return -1 - return 0 diff --git a/pyanaconda/yuminstall.py b/pyanaconda/yuminstall.py index ab4a469..aef7e8f 100644 --- a/pyanaconda/yuminstall.py +++ b/pyanaconda/yuminstall.py @@ -50,7 +50,6 @@ from yum.yumRepo import YumRepository from product import isFinal, productName, productVersion, productStamp from constants import * from image import * -from compssort import * import packages from backend import AnacondaBackend -- 1.7.11.2

2 2

[master] [PATCH] Don't rely on having some month and year selected (#859185)
by Vratislav Podzimek 25 Sep '12

25 Sep '12

Especially the year set in HW clock (and thus as system date) may be out of our range of years, that can be selected in the combobox. Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- pyanaconda/ui/gui/spokes/datetime_spoke.py | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pyanaconda/ui/gui/spokes/datetime_spoke.py b/pyanaconda/ui/gui/spokes/datetime_spoke.py index d1bc05b..5420d13 100644 --- a/pyanaconda/ui/gui/spokes/datetime_spoke.py +++ b/pyanaconda/ui/gui/spokes/datetime_spoke.py @@ -26,6 +26,7 @@ N_ = lambda x: x import logging log = logging.getLogger("anaconda") +# pylint: disable-msg=E0611 from gi.repository import AnacondaWidgets, GLib, Gtk from pyanaconda.ui.gui import GUIObject @@ -506,15 +507,28 @@ class DatetimeSpoke(NormalSpoke): return True def _save_system_time(self): + """ + Returning False from this method removes the timer that would + otherwise call it again and again. + + """ + month = self._get_combo_selection(self._monthCombo) + if not month: + return False month = self._months_nums[month] - year = int(self._get_combo_selection(self._yearCombo)) - minutes = int(self._minutesLabel.get_text()) + + year_str = self._get_combo_selection(self._yearCombo) + if not year_str: + return False + year = int(year_str) hours = int(self._hoursLabel.get_text()) if not self._radioButton24h.get_active(): hours = self._to_24h(hours, self._amPmLabel.get_text()) + minutes = int(self._minutesLabel.get_text()) + day = self._get_combo_selection(self._dayCombo) #day may be None if there is no such in the selected year and month if day: -- 1.7.11.4

2 1

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

anaconda-patches September 2012