Anaconda-devel March 2012

anaconda-devel@lists.stg.fedoraproject.org

32 participants
106 discussions

[PATCH f17-branch 1/4] Let systemd handle terminal setup, fix possible race with NM
by Will Woods 22 Mar '12

22 Mar '12

Add a systemd-generator script that puts anaconda on the correct console tty, then puts shells on tty2 and the first virtualization console (unless we're using it for anaconda). Adding "TTYPath" to the systemd services means systemd takes care of setting up all the terminal stuff - picking the right TERM value, setting the keyboard mode to K_UNICODE, and all that esoteric weirdness. Also, move anaconda's dependencies into anaconda.target, and make anaconda start *after* anaconda.target, just so we can be sure that e.g. NetworkManager is active before anaconda starts. (as a bonus, it also shuts off plymouth correctly, just in case we ever want to have a anaconda-specific bootsplash) --- anaconda.spec.in | 1 + data/systemd/Makefile.am | 4 +++- data/systemd/anaconda-generator | 34 ++++++++++++++++++++++++++++++++++ data/systemd/anaconda-shell@.service | 5 ++--- data/systemd/anaconda.service | 13 ------------- data/systemd/anaconda.target | 12 ++++++++---- data/systemd/anaconda@.service | 13 +++++++++++++ 7 files changed, 61 insertions(+), 21 deletions(-) create mode 100755 data/systemd/anaconda-generator delete mode 100644 data/systemd/anaconda.service create mode 100644 data/systemd/anaconda@.service diff --git a/anaconda.spec.in b/anaconda.spec.in index 31ea1e2..84882c2 100644 --- a/anaconda.spec.in +++ b/anaconda.spec.in @@ -225,6 +225,7 @@ update-desktop-database &> /dev/null || : %doc docs/install-methods.txt %doc docs/mediacheck.txt /lib/systemd/system/* +/lib/systemd/system-generators/* /lib/udev/rules.d/70-anaconda.rules %{_bindir}/instperf %{_sbindir}/anaconda diff --git a/data/systemd/Makefile.am b/data/systemd/Makefile.am index 589854c..ae89c18 100644 --- a/data/systemd/Makefile.am +++ b/data/systemd/Makefile.am @@ -18,5 +18,7 @@ # Author: Chris Lumens <clumens(a)redhat.com> systemddir = /lib/systemd/system -dist_systemd_DATA = anaconda-shell@.service anaconda.target anaconda.service instperf.service +generatordir = /lib/systemd/system-generators +dist_systemd_DATA = anaconda-shell@.service anaconda.target anaconda@.service instperf.service +dist_generator_SCRIPTS = anaconda-generator MAINTAINERCLEANFILES = Makefile.in diff --git a/data/systemd/anaconda-generator b/data/systemd/anaconda-generator new file mode 100755 index 0000000..6545572 --- /dev/null +++ b/data/systemd/anaconda-generator @@ -0,0 +1,34 @@ +#!/bin/bash +# anaconda-generator: generate services needed for anaconda operation + +# set up dirs +systemd_dir=/lib/systemd/system +target_dir=$systemd_dir/anaconda.target.wants +mkdir -p $target_dir + +# create symlink anaconda.target.wants/SERVICE(a)TTY.service +service_on_tty() { + local service="$1" tty="$2" + local service_instance="${service/@.service/@$tty.service}" + ln -sf $systemd_dir/$service $target_dir/$service_instance +} + +# find the real tty for /dev/console +tty="console" +while [ -f /sys/class/tty/$tty/active ]; do + tty=$(< /sys/class/tty/$tty/active) + tty=${tty##* } # last item in the list +done +consoletty="$tty" + +# put anaconda on the real console +service_on_tty anaconda@.service $consoletty + +# put a shell on tty2 and the first virtualization console we find +for tty in tty2 hvc0 hvc1 xvc0 hvsi0 hvsi1 hvsi2; do + [ "$tty" = "$consoletty" ] && continue + if [ -d /sys/class/tty/$tty ]; then + service_on_tty anaconda-shell@.service $tty + [ "$tty" != "tty2" ] && break + fi +done diff --git a/data/systemd/anaconda-shell@.service b/data/systemd/anaconda-shell@.service index ad2141e..52bed74 100644 --- a/data/systemd/anaconda-shell@.service +++ b/data/systemd/anaconda-shell@.service @@ -6,14 +6,13 @@ BindTo=dev-%i.device After=dev-%i.device systemd-user-sessions.service plymouth-quit-wait.service [Service] -Environment=TERM=linux WorkingDirectory=/ ExecStart=-/sbin/agetty -n -l /bin/bash -o '--login' %I 38400 Restart=always RestartSec=0 -TimeoutSec=0 -TTYPath=/dev/%i +TTYPath=/dev/%I TTYReset=yes TTYVHangup=yes TTYVTDisallocate=yes +KillMode=process KillSignal=SIGHUP diff --git a/data/systemd/anaconda.service b/data/systemd/anaconda.service deleted file mode 100644 index 45061cc..0000000 --- a/data/systemd/anaconda.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=the anaconda installation program -Wants=instperf.service rsyslog.service udev-settle.service NetworkManager.service -After=instperf.service rsyslog.service udev-settle.service NetworkManager.service - -[Service] -Environment=HOME=/root MALLOC_CHECK_=2 MALLOC_PERTURB_=204 PATH=/usr/bin:/bin:/sbin:/usr/sbin:/mnt/sysimage/bin:/mnt/sysimage/usr/bin:/mnt/sysimage/usr/sbin:/mnt/sysimage/sbin PYTHONPATH=/tmp/updates -Type=oneshot -WorkingDirectory=/root -ExecStart=/usr/sbin/anaconda -StandardInput=tty-force -TTYReset=yes -TimeoutSec=0 diff --git a/data/systemd/anaconda.target b/data/systemd/anaconda.target index 9f7f3be..983ff3b 100644 --- a/data/systemd/anaconda.target +++ b/data/systemd/anaconda.target @@ -1,7 +1,11 @@ [Unit] -Description=The anaconda installation program +Description=Anaconda System Services Requires=basic.target -Conflicts=rescue.service rescue.target -After=basic.target rescue.service rescue.target +After=basic.target AllowIsolate=yes -Wants=anaconda.service anaconda-shell(a)tty2.service anaconda-shell(a)hvc1.service fedora-import-state.service +Before=anaconda@.service +Wants=instperf.service +Wants=rsyslog.service +Wants=udev-settle.service +Wants=NetworkManager.service +Wants=plymouth-quit.service plymouth-quit-wait.service diff --git a/data/systemd/anaconda@.service b/data/systemd/anaconda@.service new file mode 100644 index 0000000..903df7a --- /dev/null +++ b/data/systemd/anaconda@.service @@ -0,0 +1,13 @@ +[Unit] +Description=Anaconda +After=anaconda.target + +[Service] +Environment=HOME=/root MALLOC_CHECK_=2 MALLOC_PERTURB_=204 PATH=/usr/bin:/bin:/sbin:/usr/sbin:/mnt/sysimage/bin:/mnt/sysimage/usr/bin:/mnt/sysimage/usr/sbin:/mnt/sysimage/sbin PYTHONPATH=/tmp/updates +Type=oneshot +WorkingDirectory=/root +ExecStart=/usr/sbin/anaconda +StandardInput=tty-force +TTYPath=/dev/%I +TTYReset=yes +TimeoutSec=0 -- 1.7.7.6

2 5

[F17-BRANCH] Revert "dracut: use /run/install/source for repodir"
by Brian C. Lane 22 Mar '12

22 Mar '12

From: "Brian C. Lane" <bcl(a)redhat.com> Anaconda needs to be able to unmount /run/install/source which cannot be done when we are running from it. Leave it at /run/install/repo This reverts commit 37144b9e86e801074fa4ae4656da458fe83f6e07. --- dracut/anaconda-lib.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dracut/anaconda-lib.sh b/dracut/anaconda-lib.sh index 171071e..9d15e51 100755 --- a/dracut/anaconda-lib.sh +++ b/dracut/anaconda-lib.sh @@ -39,7 +39,7 @@ find_runtime() { done } -repodir="/run/install/source" +repodir="/run/install/repo" isodir="/run/install/isodir" rulesfile="/etc/udev/rules.d/90-anaconda.rules" -- 1.7.7.6

1 0

grubby patches (autotest boottool work)
by Cleber Rosa 22 Mar '12

22 Mar '12

This series include the grubby side of the boottool work we've been doing for autotest(.github.com). Some are new versions of previous RFCs, and some are brand new. Feel free to comment/apply selectively. Series summary: [PATCH 01/10] Support systems that do not have /boot as a separate [PATCH 02/10] Fix for grub on SuSE systems: lba and boot information [PATCH 03/10] Fix for grub on SuSE systems: test lba and boot info [PATCH 04/10] Fix grub detection on SuSE systems: config file order [PATCH 05/10] ppc64/yaboot: add support for probing the currently [PATCH 06/10] ia64/elilo: add support for probing the currently [PATCH 07/10] test.sh: revert bash 4 only syntax change [PATCH 08/10] test.sh: enable the use of MALLOC_PERTURB_ [PATCH 09/10] Add --set-default-index feature [PATCH 10/10] grubby.8: fixes for the grubby man page Diff stat: grubby.8 | 13 +- grubby.c | 405 +++++++++++++++++++++-- test.sh | 13 +- test/grub.12 | 32 ++ test/grub.12-support_files/boot/grub/device.map | 1 + test/grub.12-support_files/etc/SuSE-release | 3 + test/grub.12-support_files/etc/grub.conf | 2 + test/results/info/g12.1 | 8 + 8 files changed, 446 insertions(+), 31 deletions(-)

2 16

[rhel6-branch] Anaconda, be nice and return what is not yours...
by Vratislav Podzimek 22 Mar '12

22 Mar '12

Resolves: rhbz#747219 These two simple patches allow enabling Ctrl+C functionality back in init when Anaconda crashes. -- Vratislav Podzimek

2 3

[PATCH V2] mkefiboot: Make Apple boot images appear in the startup preferences
by Matthew Garrett 21 Mar '12

21 Mar '12

There's a small amount of additional metadata required for the Mac boot images to appear as bootable devices in the startup preferencs, so add support for generating that. --- I managed to send the unfixed version of this. I am awful. share/efi.tmpl | 2 +- src/sbin/mkefiboot | 34 ++++++++++++++++++++++++++++++---- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/share/efi.tmpl b/share/efi.tmpl index 7cd5850..db5aa0b 100644 --- a/share/efi.tmpl +++ b/share/efi.tmpl @@ -19,7 +19,7 @@ ${make_efiboot("images/macboot.img", imgtype="apple")} eficonf = "%s/BOOT%s.conf" % (EFIBOOTDIR, efiarch) args = "--label=ANACONDA" if disk: args += " --disk" - if imgtype == "apple": args += " --apple --icon=%s" % APPLE_EFI_ICON + if imgtype == "apple": args += ' --apple --icon=%s --product="%s %s"' % (APPLE_EFI_ICON, product.name, product.version) %> %if include_kernel: copy ${KERNELDIR}/vmlinuz ${EFIBOOTDIR} diff --git a/src/sbin/mkefiboot b/src/sbin/mkefiboot index 84b9c5e..fd27663 100755 --- a/src/sbin/mkefiboot +++ b/src/sbin/mkefiboot @@ -27,27 +27,51 @@ def mkefiboot(bootdir, outfile, label): '''Make an EFI boot image with the contents of bootdir in EFI/BOOT''' mkdosimg(None, outfile, label=label, graft={'EFI/BOOT':bootdir}) -def mkmacboot(bootdir, outfile, label, icon=None): +def mkmacboot(bootdir, outfile, label, icon=None, product='Generic'): '''Make an EFI boot image for Apple's EFI implementation''' graft = {'EFI/BOOT':bootdir} if icon: graft['.VolumeIcon.icns'] = icon mkhfsimg(None, outfile, label=label, graft=graft) - macbless(outfile) + macmunge(outfile, product) # To make an HFS+ image bootable, we need to fill in parts of the # HFSPlusVolumeHeader structure - specifically, finderInfo[0,1,5]. # For details, see Technical Note TN1150: HFS Plus Volume Format # http://developer.apple.com/library/mac/#technotes/tn/tn1150.html -def macbless(imgfile): +# +# Additionally, we want to do some fixups to make it play nicely with +# the startup disk preferences panel. +def macmunge(imgfile, product): '''"bless" the EFI bootloader inside the given Mac EFI boot image, by writing its inode info into the HFS+ volume header.''' # Get the inode number for the boot image and its parent directory with LoopDev(imgfile) as loopdev: with Mount(loopdev) as mnt: loader = glob.glob(os.path.join(mnt,'EFI/BOOT/BOOT*.efi'))[0] + config = glob.glob(os.path.join(mnt,'EFI/BOOT/BOOT*.conf'))[0] blessnode = os.stat(loader).st_ino dirnode = os.stat(os.path.dirname(loader)).st_ino + with open(os.path.join(mnt,'mach_kernel'), 'w') as kernel: + kernel.write('Dummy kernel for booting') + sysdir = os.path.join(mnt,'System/Library/CoreServices/') + os.makedirs(sysdir) + with open(os.path.join(sysdir,'SystemVersion.plist'), 'w') as plist: + plist.write('''<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> +<key>ProductBuildVersion</key> +<string></string> +<key>ProductName</key> +<string>Linux</string> +<key>ProductVersion</key> +<string>%s</string> +</dict> +</plist> +''' % (product,)) + os.link(loader, os.path.join(sysdir,'boot.efi')) + os.link(config, os.path.join(sysdir,'boot.conf')) # format data properly (big-endian UInt32) nodedata = struct.pack(">i", blessnode) dirdata = struct.pack(">i", dirnode) @@ -88,6 +112,8 @@ if __name__ == '__main__': help="filesystem label to use (default: %(default)s)") parser.add_argument("-i", "--icon", metavar="ICONFILE", help="icon file to include (for Apple EFI image)") + parser.add_argument("-p", "--product", metavar="PRODUCT", + help="product name to use (for Apple EFI image)") parser.add_argument("bootdir", metavar="EFIBOOTDIR", help="input directory (will become /EFI/BOOT in the image)") parser.add_argument("outfile", metavar="OUTPUTFILE", @@ -102,7 +128,7 @@ if __name__ == '__main__': print "Warning: --icon is only useful for Apple EFI images" # do the thing! if opt.imgtype == "apple": - mkmacboot(opt.bootdir, opt.outfile, opt.label, opt.icon) + mkmacboot(opt.bootdir, opt.outfile, opt.label, opt.icon, opt.product) else: mkefiboot(opt.bootdir, opt.outfile, opt.label) if opt.disk: -- 1.7.7.6

2 1

[PATCH f17-branch 1/5] fix nfsiso:...:/path/to/filename.iso (#804515)
by Will Woods 21 Mar '12

21 Mar '12

If we're given the path to an iso, we need to split it up so we mount the directory the iso is *in*, and then mount the iso. Also, fix a harmless typo bug in find_runtime and clean up/clarify anaconda_live_root_dir a bit. --- dracut/anaconda-lib.sh | 22 +++++++++++++++------- dracut/anaconda-netroot.sh | 11 +++++++++-- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/dracut/anaconda-lib.sh b/dracut/anaconda-lib.sh index 171071e..7f1a264 100755 --- a/dracut/anaconda-lib.sh +++ b/dracut/anaconda-lib.sh @@ -32,8 +32,9 @@ find_iso() { } find_runtime() { - local ti_img="" dir="$1$2" - [ -e $dir/.treeinfo ] && img=$(config_get stage2 mainimage < $dir/.treeinfo) + local ti_img="" dir="$1" + [ -e $dir/.treeinfo ] && \ + ti_img=$(config_get stage2 mainimage < $dir/.treeinfo) for f in $ti_img images/install.img LiveOS/squashfs.img; do [ -e "$dir/$f" ] && echo "$dir/$f" && return done @@ -43,17 +44,24 @@ repodir="/run/install/source" isodir="/run/install/isodir" rulesfile="/etc/udev/rules.d/90-anaconda.rules" +# try to find a usable runtime image from the repo mounted at $mnt. +# if successful, move the mount(s) to $repodir/$isodir. anaconda_live_root_dir() { - local img="" iso="" dir="$1" path="$2"; shift 2 - img=$(find_runtime $repodir$path) + local img="" iso="" mnt="$1" path="$2"; shift 2 + img=$(find_runtime $mnt/$path) if [ -n "$img" ]; then info "anaconda: found $img" + [ "$dir" = "$repodir" ] || mount --move $mnt $repodir else - iso=$(find_iso $repodir$path) + if [ "${path%.iso}" != "$path" ]; then + iso=$path + else + iso=$(find_iso $mnt/$path) + fi [ -n "$iso" ] || { warn "no suitable images"; return 1; } info "anaconda: found $iso" - mount --move $repodir $isodir - iso=${isodir}${iso#$repodir} + mount --move $mnt $isodir + iso=${isodir}/${iso#$mnt} mount -o loop,ro $iso $repodir img=$(find_runtime $repodir) || { warn "$iso has no suitable runtime"; } fi diff --git a/dracut/anaconda-netroot.sh b/dracut/anaconda-netroot.sh index 7c474dd..6be34a7 100755 --- a/dracut/anaconda-netroot.sh +++ b/dracut/anaconda-netroot.sh @@ -25,8 +25,15 @@ case $repo in . /lib/nfs-lib.sh info "anaconda mounting NFS repo at $repo" str_starts "$repo" "nfsiso:" && repo=nfs:${repo#nfsiso:} - mount_nfs "$repo" "$repodir" "$netif" || warn "Couldn't mount $repo" - anaconda_live_root_dir $repodir + if [ "${repo%.iso}" == "$repo" ]; then + mount_nfs "$repo" "$repodir" "$netif" || warn "Couldn't mount $repo" + anaconda_live_root_dir $repodir + else + iso="${repo##*/}" + mount_nfs "${repo%$iso}" "$repodir" "$netif" || \ + warn "Couldn't mount $repo" + anaconda_live_root_dir $repodir $iso + fi ;; http*|ftp*) . /lib/url-lib.sh -- 1.7.7.6

3 7

F17 bogus "could not detect partitions" error
by Chris Murphy 21 Mar '12

21 Mar '12

I'm not yet filing a bug because I think this mostly "works as designed" however it's a flawed design, in my view. It results in a hideous user experience. Part of the bug, in my opinion, is due to parted's behavior. But anaconda has a role in this also because it comes up with yet a different message than parted, but it's still wrong. This problem was originally found by a user, using F16. I've reproduced it using F17 beta TC1. The setup: ----------- Disk has a valid MBR, and a perfectly bootable Windows 7 system. Upon launching Fedora installer (F16 or F17 beta TC1), after choosing "Basic Storage Devices" I get a message: The storage device below may contain data. [lists the disk type size connection etc] We could not detect partitions or filesystems on this device. This could be because the device is blank, unpartitioned, or vitual. If not, there may be data on the device that can not be recovered if you use it in this installation....... Yes, discard any data = DESTROYS the MBR and the Windows 7 installation if proceeding beyond installation type selection and writing changes. No, keep any data = failure to install. The result: ------------ 1. I can blow away Windows. 2. I can quit the installer. 3. I get no 3rd option. This is a truly hideous user experience, across the board. None of the explanations in the anaconda dialog are true. The disk is not blank. It is not unpartitioned. It is not virtual. (OK original user report is a real hard drive, but I reproduced this with a VM.) Here's how I can reproduce the problem. Steps to reproduce the problem: -------------------------------- 1. Brand new unpartitioned disk. 2. Install Fedora 16/17, which causes by default a GPT scheme to be used. 3. Realize you should have installed Windows 7 first. 4. Blow away Fedora with the Windows 7 installer, which by default creates an MBR scheme, but does not blank out the GPT. 5. Try to install Fedora. Result: Major fail, per above. parted has this to say about the disk: --------------------------------------- Warning: /dev/sda contains GPT signatures, indicating that it has a GPT table. However, it does not have a valid fake msdos partition table, as it should. Perhaps it was corrupted -- possibly by a program that doesn't understand GPT partition tables. Or perhaps you deleted the GPT table, and are now using an msdos partitiontable. Is this a GPT partition table? yes/no? Yes treats it as GPT, with the full GPT data intact. No treats it as unknown, with no partitions at all intact. I separately have mentioned the following complaints about parted's behavior, on the bug-parted@ list, but I'll list a summary here: 1. The message is bogus and confusing. It says the disk has GPT signatures, but then later says maybe they've been deleted. Which is it? In fact the GPT is not corrupt, and not deleted. 2. UEFI spec suggests a valid legacy MBR shouldn't be treated as GPT. It's an MBR disk unless it has a valid protective MBR, which this disk does not have. 3. parted appears to have no way to handle this situation, made more common now that Fedora is defaults to GPT on "Use All Space" and new unpartitioned disks. So those are the facts. Next it's a question on how to improve the result, or at the very least not produce totally bogus error messages that don't tell the user what the problem really is, or how to fix it. What fixes this is deleting the GPT and rerunning the installer. fixparts and gdisk can do this. I'm not finding anything in parted that can help, but I have by no means done an exhaustive search. Chris Murphy

3 11

[lorax] Add spice-vdagent to initrd (#804739)
by Martin Gracik 21 Mar '12

21 Mar '12

--- share/runtime-install.tmpl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/share/runtime-install.tmpl b/share/runtime-install.tmpl index e4c6b17..eb73c82 100644 --- a/share/runtime-install.tmpl +++ b/share/runtime-install.tmpl @@ -105,7 +105,7 @@ installpkg fpaste ## extra tools not required by anaconda installpkg vim-minimal strace lsof dump xz less eject installpkg wget rsync rsh bind-utils ftp mtr vconfig rdate -installpkg icfg +installpkg icfg spice-vdagent ## actually install all the requested packages run_pkg_transaction -- 1.7.5.4

2 2

[lorax] Add ntfs-3g to initrd (#804302)
by Martin Gracik 21 Mar '12

21 Mar '12

--- share/runtime-install.tmpl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/share/runtime-install.tmpl b/share/runtime-install.tmpl index 1776fd7..e4c6b17 100644 --- a/share/runtime-install.tmpl +++ b/share/runtime-install.tmpl @@ -58,7 +58,7 @@ installpkg gnome-keyring installpkg python-imaging ## filesystem tools -installpkg btrfs-progs jfsutils xfsprogs reiserfs-utils gfs2-utils ntfsprogs +installpkg btrfs-progs jfsutils xfsprogs reiserfs-utils gfs2-utils ntfs-3g ntfsprogs installpkg python-volume_key volume_key ## SELinux support -- 1.7.5.4

4 4

[python-meh] Add %check to the spec file
by Vratislav Podzimek 21 Mar '12

21 Mar '12

There is a request from QA guys that we should run 'make test' in %check section of the spec file. -- Vratislav Podzimek

2 3

← Newer
1
2
3
4
5
6
7
...
11
Older →

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Anaconda-devel March 2012