Anaconda-devel April 2012

anaconda-devel@lists.stg.fedoraproject.org

41 participants
99 discussions

Ability to install to loopmounted filesystem - mentor wanted
by Tirtha Chatterjee 02 Dec '12

02 Dec '12

Hello. I am trying to implement something like Wubi on Fedora. For this, I first need to make it possible to install to loopmounted filesystems through anaconda. I don't think a lot of modification to the existing source code is required. I tried going through the source code, but it seemed quite big to manage without some guidance. I would be extremely happy if someone guided me on this. Hoping for an affirmative reply :-) -- Regards Tirtha Chatterjee KDE developer http://wyuka.co.cc/

2 3

[PATCH f17-branch 1/4] dracut: fix typo (stray '\n' in anaconda.rules)
by Will Woods 01 May '12

01 May '12

--- dracut/repo-genrules.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dracut/repo-genrules.sh b/dracut/repo-genrules.sh index 5f44a13..6ba8dcd 100755 --- a/dracut/repo-genrules.sh +++ b/dracut/repo-genrules.sh @@ -14,6 +14,6 @@ case "$root" in # special catch-all rule for CDROMs echo 'ENV{ID_CDROM}=="1",' \ 'RUN+="/sbin/initqueue --settled --onetime' \ - '/sbin/anaconda-diskroot $env{DEVNAME}"\n' >> $rulesfile + '/sbin/anaconda-diskroot $env{DEVNAME}"' >> $rulesfile ;; esac -- 1.7.7.6

2 4

[lorax] s390x update
by Dan Horák 30 Apr '12

30 Apr '12

please apply to both f17 and master branches [PATCH] include the new cmsfs-fuse interface

4 6

[PATCH anaconda/master] Add support to determine the ARM processor variety and select the correct kernel to install.
by d.marlin 29 Apr '12

29 Apr '12

From: "d.marlin" <dmarlin(a)redhat.com> Signed-off-by: David A. Marlin <dmarlin(a)redhat.com> --- pyanaconda/iutil.py | 36 ++++++++++++++++++++++++++++++++++++ pyanaconda/platform.py | 5 +++++ pyanaconda/yuminstall.py | 6 ++++++ 3 files changed, 47 insertions(+), 0 deletions(-) diff --git a/pyanaconda/iutil.py b/pyanaconda/iutil.py index dd691dc..2864980 100644 --- a/pyanaconda/iutil.py +++ b/pyanaconda/iutil.py @@ -656,6 +656,42 @@ def getPPCMacBook(): return 1 return 0 +## Get the ARM processor variety. +# @return The ARM processor variety type, or 0 if not ARM. +def getARMMachine(): + if not os.uname()[4].startswith('arm'): + return 0 + + armMachine = None + machine = None + + # ARM machine hash + armType = { + 'OMAP3 Beagle Board' : 'omap', + 'OMAP4 Panda board' : 'omap', + 'trimslice' : 'tegra', + 'Marvell GuruPlug Reference Board' : 'kirkwood', + 'Efika MX' : 'imx', + 'Genesi Efika MX' : 'imx', + 'Genesi Efika MX (Smartbook)' : 'imx', + 'Highbank' : 'highbank', + } + + f = open('/proc/cpuinfo', 'r') + lines = f.readlines() + f.close() + for line in lines: + if line.find('Hardware') != -1: + machine = line.split(':')[1] + + if machine is not None: + for type in armType.items(): + if machine.find(type[0]) != -1: + armMachine = type[1] + + return armMachine + + cell = None ## Determine if the hardware is the Cell platform. # @return True if so, False otherwise. diff --git a/pyanaconda/platform.py b/pyanaconda/platform.py index 335ab5c..5c6ddea 100644 --- a/pyanaconda/platform.py +++ b/pyanaconda/platform.py @@ -348,6 +348,7 @@ class Sparc(Platform): return start+1 class ARM(Platform): + _armMachine = iutil.getARMMachine() _bootloaderClass = bootloader.GRUB2 _boot_stage1_device_types = ["disk"] _boot_mbr_description = N_("Master Boot Record") @@ -356,6 +357,10 @@ class ARM(Platform): _disklabel_types = ["msdos"] + @property + def armMachine(self): + return self._armMachine + def getPlatform(anaconda): """Check the architecture of the system and return an instance of a Platform subclass to match. If the architecture could not be determined, diff --git a/pyanaconda/yuminstall.py b/pyanaconda/yuminstall.py index 109daec..d762959 100644 --- a/pyanaconda/yuminstall.py +++ b/pyanaconda/yuminstall.py @@ -1452,6 +1452,12 @@ reposdir=/etc/anaconda.repos.d,/tmp/updates/anaconda.repos.d,/tmp/product/anacon if selectKernel("kernel-PAE"): foundkernel = True + if not foundkernel and iutil.isARM(): + armMachine = iutil.getARMMachine() + if armMachine is not None: + selectKernel("kernel-" + armMachine) + foundkernel = True + if not foundkernel: selectKernel("kernel") -- 1.7.6.5

6 9

[f17-branch master] default to msdos disk labels (#816701)
by Brian C. Lane 28 Apr '12

28 Apr '12

From: "Brian C. Lane" <bcl(a)redhat.com> It appears that Lenovo systems aren't the only ones that have problems booting from GPT labeled disks. This patch does the following: * default to msdos labeled disks * remove the GPT blacklist * remove nogpt cmdline argument * add gpt cmdline argument to force use of GPT disklabel --- pyanaconda/flags.py | 6 +++--- pyanaconda/platform.py | 20 ++++---------------- 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/pyanaconda/flags.py b/pyanaconda/flags.py index 5728ef2..f7dd431 100644 --- a/pyanaconda/flags.py +++ b/pyanaconda/flags.py @@ -67,7 +67,7 @@ class Flags(object): # do things like bogl on them. this preserves what that # device is self.virtpconsole = None - self.nogpt = False + self.gpt = False # parse the boot commandline self.cmdline = BootArgs() # Lock it down: no more creating new flags! @@ -85,8 +85,8 @@ class Flags(object): if not selinux.is_selinux_enabled(): self.selinux = 0 - if "nogpt" in self.cmdline: - self.nogpt = True + if "gpt" in self.cmdline: + self.gpt = True cmdline_files = ['/proc/cmdline', '/run/initramfs/etc/cmdline', '/run/initramfs/etc/cmdline.d/*.conf', '/etc/cmdline'] diff --git a/pyanaconda/platform.py b/pyanaconda/platform.py index 869e567..5fbb676 100644 --- a/pyanaconda/platform.py +++ b/pyanaconda/platform.py @@ -70,9 +70,10 @@ class Platform(object): all the methods in this class.""" self.anaconda = anaconda - if flags.nogpt and "gpt" in self._disklabel_types and \ - len(self._disklabel_types) > 1: + if flags.gpt and "gpt" in self._disklabel_types: + # move GPT to the top of the list self._disklabel_types.remove("gpt") + self._disklabel_types.insert(0, "gpt") @property def diskLabelTypes(self): @@ -159,13 +160,12 @@ class X86(Platform): "mdarray": Platform._boot_raid_description} - _disklabel_types = ["gpt", "msdos"] + _disklabel_types = ["msdos", "gpt"] # XXX hpfs, if reported by blkid/udev, will end up with a type of None _non_linux_format_types = ["vfat", "ntfs", "hpfs"] def __init__(self, anaconda): super(X86, self).__init__(anaconda) - self.blackListGPT() def setDefaultPartitioning(self): """Return the default platform-specific partitioning information.""" @@ -184,18 +184,6 @@ class X86(Platform): else: return 0 - def blackListGPT(self): - """ Remove GPT disk label as an option on systems where their BIOS - doesn't boot from GPT labeled disks. - - Currently this includes: Lenovo - """ - if not os.path.isfile(DMI_CHASSIS_VENDOR): - return - buf = open(DMI_CHASSIS_VENDOR).read() - if "LENOVO" in buf.splitlines() and "gpt" in self._disklabel_types: - self._disklabel_types.remove("gpt") - class EFI(Platform): _bootloaderClass = bootloader.EFIGRUB -- 1.7.7.6

4 5

[rhel6-branch] [PATCH] Show proper message when we cannot allocate enough space for / and swap
by Vratislav Podzimek 27 Apr '12

27 Apr '12

We try to create swap big enough for hibernation in autopartioning, but this can be a problem on machines with a lot of RAM and small disks. Since we shouldn't create swap not enough big for hibernation, just let users know they should use custom partitioning in such cases. Resolves: rhbz#815557 <not-in-commit-message> This patch means that we don't need flexible swap suggestions, agreed? </not-in-commit-message> --- storage/partitioning.py | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/storage/partitioning.py b/storage/partitioning.py index b038c23..d8a5a6a 100644 --- a/storage/partitioning.py +++ b/storage/partitioning.py @@ -1716,7 +1716,22 @@ def growLVM(storage): if total_free < 0: # by now we have allocated the PVs so if there isn't enough # space in the VG we have a real problem - raise PartitioningError("not enough space for LVM requests") + + # if we cannot allocate enough space for / and swap, show + # proper error message + swap_plus_root = 0 + for lv in vg.lvs: + if lv.format.type == "swap" or lv.format.mountpoint == "/": + swap_plus_root += lv.minSize + + additional_msg = "" + if swap_plus_root > vg.size: + additional_msg = "\n\nCannot allocate enough space for / "\ + "and swap big enough to allow hibernation.\n"\ + "Use custom partitioning, please." + + raise PartitioningError("not enough space for LVM requests" + + additional_msg) elif not total_free: log.debug("vg %s has no free space" % vg.name) continue -- 1.7.4.4

2 2

[PATCH lorax/master] Add initial support for ARM based systems.
by d.marlin 27 Apr '12

27 Apr '12

From: "d.marlin" <dmarlin(a)redhat.com> Signed-off-by: David A. Marlin <dmarlin(a)redhat.com> --- share/arm.tmpl | 36 +++++++++++++++++++++++ share/config_files/uboot/boot.highbank | 5 +++ share/config_files/uboot/boot.tegra | 4 ++ share/config_files/uboot/uboot.highbank | 30 +++++++++++++++++++ share/config_files/uboot/uboot.tegra | 30 +++++++++++++++++++ share/runtime-install.tmpl | 8 ++++- src/pylorax/__init__.py | 48 +++++++++++++++++++++++++++++- src/pylorax/treebuilder.py | 4 ++- 8 files changed, 161 insertions(+), 4 deletions(-) create mode 100644 share/arm.tmpl create mode 100644 share/config_files/uboot/boot.highbank create mode 100644 share/config_files/uboot/boot.tegra create mode 100644 share/config_files/uboot/uboot.highbank create mode 100644 share/config_files/uboot/uboot.tegra diff --git a/share/arm.tmpl b/share/arm.tmpl new file mode 100644 index 0000000..368d511 --- /dev/null +++ b/share/arm.tmpl @@ -0,0 +1,36 @@ +<%page args="kernels, runtime_img, runtime_base, basearch, outroot"/> +<% +configdir="tmp/config_files/uboot" +BOOTDIR="boot" +KERNELDIR=BOOTDIR +UIMAGE_ADDRESS="0x00008000" +INITRD_ADDRESS="0x00000000" +# U-Boot will only handle one kernel +kernel = kernels[0] +%> + +## install bootloader (such as it is) and bootloader config + +mkdir ${BOOTDIR} +# default to Trim Slice (tegra) for now +install ${configdir}/boot.tegra ${BOOTDIR}/boot.cmd + +## configure bootloader +#replace @INITRD_LOAD_ADDRESS@ ${INITRD_ADDRESS} ${BOOTDIR}/boot.cmd +#replace @IMAGE_LOAD_ADDRESS@ ${UIMAGE_ADDRESS} ${BOOTDIR}/boot.cmd + +runcmd mkimage \ + -A arm -O linux -T script -C none \ + -a 0 -e 0 -n "Trim Slice boot script" \ + -d ${outroot}/${BOOTDIR}/boot.cmd ${outroot}/${BOOTDIR}/boot.scr + + +install ${runtime_img} ${BOOTDIR} +#treeinfo stage2 mainimage boot/${runtime_base} + +## install kernel +installkernel images-${basearch} ${kernel.path} ${KERNELDIR}/kernel.img +installinitrd images-${basearch} ${kernel.initrd.path} ${KERNELDIR}/initrd.img + +## FIXME: ARM may need some extra boot config + diff --git a/share/config_files/uboot/boot.highbank b/share/config_files/uboot/boot.highbank new file mode 100644 index 0000000..b24e660 --- /dev/null +++ b/share/config_files/uboot/boot.highbank @@ -0,0 +1,5 @@ +setenv bootargs console=ttyAMA0 root=/dev/sda2 rw rootwait earlyprintk rd_NO_PLYMOUTH +ext2load scsi 0:1 600000 uImage +ext2load scsi 0:1 880000 uInitrd +ext2load scsi 0:1 1000000 highbank.dtb +bootm 600000 880000 1000000 diff --git a/share/config_files/uboot/boot.tegra b/share/config_files/uboot/boot.tegra new file mode 100644 index 0000000..44f16bc --- /dev/null +++ b/share/config_files/uboot/boot.tegra @@ -0,0 +1,4 @@ +setenv bootargs mem=384M@0M mem=512M@512M nvmem=128M@384M vmalloc=248M video=tegrafb console=ttyS0,115200n8 rw root=/dev/sda3 nohdparm rootwait earlyprintk rd_NO_PLYMOUTH +ext2load usb 0:3 4080000 /boot/uImage +ext2load usb 0:3 4480000 /boot/uInitrd +bootm 4080000 4480000 diff --git a/share/config_files/uboot/uboot.highbank b/share/config_files/uboot/uboot.highbank new file mode 100644 index 0000000..0b83dee --- /dev/null +++ b/share/config_files/uboot/uboot.highbank @@ -0,0 +1,30 @@ +# Settings for uBoot setup in /sbin/new-kernel-pkg +# +# Default values are provided below (as comments) +# +# WARNING: These values affect where grubby installs and removes +# uBoot kernel images. Changing these _after_ kernels have +# been installed may cause removing a kernel image to fail. + +# directory where uBoot images and scripts are found +#UBOOT_DIR=/boot/uboot +UBOOT_DIR=/boot + +# name of the text file containing the list of installed kernel versions +# NOTE: The versions are in order of installation. The last entry should +# always be the default boot kernel version. +#UBOOT_KLIST=klist.txt + +# device partition where uBoot images reside; mounted on $UBOOT_DIR +#UBOOT_DEVICE=mmcblk0p1 +UBOOT_DEVICE=sda1 + +# NOTE: Both of the following files are automatically overwritte +# when a kernel package is installed or removed. + +# default kernel uImage file name +#UBOOT_UIMAGE=uImage + +# default initrd uInitrd file name +#UBOOT_UINITRD=uInitrd + diff --git a/share/config_files/uboot/uboot.tegra b/share/config_files/uboot/uboot.tegra new file mode 100644 index 0000000..0b83dee --- /dev/null +++ b/share/config_files/uboot/uboot.tegra @@ -0,0 +1,30 @@ +# Settings for uBoot setup in /sbin/new-kernel-pkg +# +# Default values are provided below (as comments) +# +# WARNING: These values affect where grubby installs and removes +# uBoot kernel images. Changing these _after_ kernels have +# been installed may cause removing a kernel image to fail. + +# directory where uBoot images and scripts are found +#UBOOT_DIR=/boot/uboot +UBOOT_DIR=/boot + +# name of the text file containing the list of installed kernel versions +# NOTE: The versions are in order of installation. The last entry should +# always be the default boot kernel version. +#UBOOT_KLIST=klist.txt + +# device partition where uBoot images reside; mounted on $UBOOT_DIR +#UBOOT_DEVICE=mmcblk0p1 +UBOOT_DEVICE=sda1 + +# NOTE: Both of the following files are automatically overwritte +# when a kernel package is installed or removed. + +# default kernel uImage file name +#UBOOT_UIMAGE=uImage + +# default initrd uInitrd file name +#UBOOT_UINITRD=uInitrd + diff --git a/share/runtime-install.tmpl b/share/runtime-install.tmpl index 29c8565..aadb47e 100644 --- a/share/runtime-install.tmpl +++ b/share/runtime-install.tmpl @@ -11,7 +11,13 @@ installpkg iscsi-initiator-utils installpkg firstaidkit-plugin-{passwd,key-recovery,mdadm-conf} ## kernel and firmware -installpkg kernel +## ARM kernels are platform specific +%if basearch in ("arm", "armhfp") and arch.platform != None: + installpkg kernel-${arch.platform} +%else: + installpkg kernel +%endif + %if basearch != "s390x": installpkg *-firmware %endif diff --git a/src/pylorax/__init__.py b/src/pylorax/__init__.py index 2133d60..1c13de7 100644 --- a/src/pylorax/__init__.py +++ b/src/pylorax/__init__.py @@ -55,13 +55,57 @@ class ArchData(DataHolder): lib64_arches = ("x86_64", "ppc64", "sparc64", "s390x", "ia64") bcj_arch = dict(i386="x86", x86_64="x86", ppc="powerpc", ppc64="powerpc", - sparc="sparc", sparc64="sparc") + sparc="sparc", sparc64="sparc", + armv5tel="arm", armv7l="arm", + armv7hl="armhfp") + def __init__(self, buildarch): self.buildarch = buildarch self.basearch = getBaseArch(buildarch) self.libdir = "lib64" if self.basearch in self.lib64_arches else "lib" self.bcj = self.bcj_arch.get(self.basearch) + self.platform = None + if self.basearch in ("arm", "armhfp"): + self.platform = self.getARMMachine() + + + ## Get the ARM processor variety. + # @return The ARM processor variety type, or 0 if not ARM. + def getARMMachine(self): + if not os.uname()[4].startswith('arm'): + return 0 + + armMachine = None + machine = None + + # ARM machine hash + armType = { + 'OMAP3 Beagle Board' : 'omap', + 'OMAP4 Panda board' : 'omap', + 'trimslice' : 'tegra', + 'Marvell GuruPlug Reference Board' : 'kirkwood', + 'Efika MX' : 'imx', + 'Genesi Efika MX' : 'imx', + 'Genesi Efika MX (Smartbook)' : 'imx', + 'Highbank' : 'highbank', + } + + f = open('/proc/cpuinfo', 'r') + lines = f.readlines() + f.close() + for line in lines: + if line.find('Hardware') != -1: + machine = line.split(':')[1] + + if machine is not None: + for type in armType.items(): + if part.find(type[0]) != -1: + armMachine = type[1] + + return armMachine + + class Lorax(BaseLoraxClass): def __init__(self): @@ -173,7 +217,7 @@ class Lorax(BaseLoraxClass): logger.info("setting up build architecture") self.arch = ArchData(buildarch) - for attr in ('buildarch', 'basearch', 'libdir'): + for attr in ('buildarch', 'basearch', 'libdir', 'platform'): logger.debug("self.arch.%s = %s", attr, getattr(self.arch,attr)) logger.info("setting up build parameters") diff --git a/src/pylorax/treebuilder.py b/src/pylorax/treebuilder.py index 50fb1f9..9809ebc 100644 --- a/src/pylorax/treebuilder.py +++ b/src/pylorax/treebuilder.py @@ -39,6 +39,8 @@ templatemap = { 'sparc64': 'sparc.tmpl', 's390': 's390.tmpl', 's390x': 's390.tmpl', + 'arm': 'arm.tmpl', + 'armhfp': 'arm.tmpl', } def generate_module_info(moddir, outfile=None): @@ -154,7 +156,7 @@ class TreeBuilder(object): def __init__(self, product, arch, inroot, outroot, runtime, isolabel, templatedir=None): # NOTE: if you pass an arg named "runtime" to a mako template it'll # clobber some mako internal variables - hence "runtime_img". - self.vars = DataHolder(arch=arch, product=product, runtime_img=runtime, + self.vars = DataHolder(arch=arch, platform=arch.platform, product=product, runtime_img=runtime, runtime_base=basename(runtime), inroot=inroot, outroot=outroot, basearch=arch.basearch, libdir=arch.libdir, -- 1.7.6.5

1 0

[PATCH anaconda/master] Add initial support for ARM based systems.
by d.marlin 27 Apr '12

27 Apr '12

From: "d.marlin" <dmarlin(a)redhat.com> Signed-off-by: David A. Marlin <dmarlin(a)redhat.com> --- pyanaconda/iutil.py | 5 +++++ pyanaconda/platform.py | 11 +++++++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/pyanaconda/iutil.py b/pyanaconda/iutil.py index 5c68e02..dd691dc 100644 --- a/pyanaconda/iutil.py +++ b/pyanaconda/iutil.py @@ -766,6 +766,9 @@ def isAlpha(): def isSparc(): return os.uname()[4].startswith('sparc') +def isARM(): + return os.uname()[4].startswith('arm') + def getArch(): if isX86(bits=32): return 'i386' @@ -779,6 +782,8 @@ def getArch(): return 'alpha' elif isSparc(): return 'sparc' + elif isARM(): + return 'arm' else: return os.uname()[4] diff --git a/pyanaconda/platform.py b/pyanaconda/platform.py index e5875e3..335ab5c 100644 --- a/pyanaconda/platform.py +++ b/pyanaconda/platform.py @@ -347,6 +347,15 @@ class Sparc(Platform): start /= long(1024 / disk.device.sectorSize) return start+1 +class ARM(Platform): + _bootloaderClass = bootloader.GRUB2 + _boot_stage1_device_types = ["disk"] + _boot_mbr_description = N_("Master Boot Record") + _boot_descriptions = {"disk": _boot_mbr_description, + "partition": Platform._boot_partition_description} + + _disklabel_types = ["msdos"] + def getPlatform(anaconda): """Check the architecture of the system and return an instance of a Platform subclass to match. If the architecture could not be determined, @@ -373,5 +382,7 @@ def getPlatform(anaconda): return EFI(anaconda) elif iutil.isX86(): return X86(anaconda) + elif iutil.isARM(): + return ARM(anaconda) else: raise SystemError, "Could not determine system architecture." -- 1.7.6.5

2 1

[PATCH f17-branch] Fix twisty logic around forcing text mode (#811868)
by Will Woods 27 Apr '12

27 Apr '12

The existing logic forces text-mode if /usr/bin/Xorg is missing. Except it doesn't check if you're using VNC first, which caused problems on certain POWER systems where we're not including Xorg anymore. We could just add 'and not flags.usevnc' to the if statement but it's already really, *really* hard to understand what's going on there. So: this patch cleans up the logic in a way that should be equivalent, *and* fixes the bug. A couple notes, if you're checking my work: - The flags.livecdInstall check was to avoid starting X during liveinst (assuming it'd already be running on a live system), so the intent there was: flags.livecdInstall == flags.preexisting_x11 - The 'isS390' check in the first block was added in commit 4d42471, way back in 2004: "enable GUI/VNC installs on mainframe again, there's no Xorg binary". So the intent there was: isS390 == (flags.preexisting_x11 or flags.usevnc) Knowing that, you can replace the conditions and do a little juggling and come up with what I have here. Or something like it. --- anaconda | 35 ++++++++++++++++------------------- 1 files changed, 16 insertions(+), 19 deletions(-) diff --git a/anaconda b/anaconda index bf26013..b76af4d 100755 --- a/anaconda +++ b/anaconda @@ -507,30 +507,27 @@ def setupDisplay(anaconda, opts): log.info("Display mode = %s" % anaconda.displayMode) check_memory(anaconda, opts) - # - # now determine if we're going to run in GUI or TUI mode - # - # if no X server, we have to use text mode - if anaconda.displayMode == 'g' and not flags.livecdInstall \ - and not iutil.isS390() \ - and not os.access("/usr/bin/Xorg", os.X_OK): - stdoutLog.warning(_("Graphical installation is not available. " - "Starting text mode.")) - time.sleep(2) - anaconda.displayMode = 't' - - # s390/iSeries checks - if anaconda.isHeadless and anaconda.displayMode == "g" and not \ - (flags.preexisting_x11 or flags.usevnc): + # Should we try to start Xorg? + want_x = anaconda.displayMode == 'g' and \ + not (flags.preexisting_x11 or flags.usevnc) + + # X on a headless (e.g. s390) system? Nonsense! + if want_x and anaconda.isHeadless: stdoutLog.warning(_("DISPLAY variable not set. Starting text mode.")) anaconda.displayMode = 't' graphical_failed = 1 time.sleep(2) + want_x = False + + # Is Xorg is actually available? + if want_x and not os.access("/usr/bin/Xorg", os.X_OK): + stdoutLog.warning(_("Graphical installation is not available. " + "Starting text mode.")) + time.sleep(2) + anaconda.displayMode = 't' + want_x = False - # if DISPLAY not set either vnc server failed to start or we're not - # running on a redirected X display, so start local X server - if anaconda.displayMode == 'g' and not flags.preexisting_x11 and \ - not flags.usevnc: + if want_x: # The following code depends on no SIGCHLD being delivered, # possibly only except the one from a failing X.org. Thus # make sure before entering this section that all the other -- 1.7.7.6

3 2

[PATCH f17-branch] s390 systems are always headless
by Will Woods 26 Apr '12

26 Apr '12

loader used to set 'headless' unconditionally for s390 systems, so do that here. --- anaconda | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/anaconda b/anaconda index 5911618..bf26013 100755 --- a/anaconda +++ b/anaconda @@ -439,7 +439,7 @@ def setupDisplay(anaconda, opts): vncS.anaconda = anaconda anaconda.displayMode = opts.display_mode - anaconda.isHeadless = opts.isHeadless + anaconda.isHeadless = opts.isHeadless or iutil.isS390() if opts.vnc: flags.usevnc = 1 -- 1.7.7.6

2 1

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Anaconda-devel April 2012