Merge branch 'master' into newui-merge

Conflicts:
	Makefile.am
	anaconda
	anaconda.spec.in
	loader/loader.c
	loader/net.c
	loader/unpack.c
	po/POTFILES.in
	pyanaconda/__init__.py
	pyanaconda/bootloader.py
	pyanaconda/cmdline.py
	pyanaconda/constants.py
	pyanaconda/dispatch.py
	pyanaconda/errors.py
	pyanaconda/flags.py
	pyanaconda/iutil.py
	pyanaconda/kickstart.py
	pyanaconda/platform.py
	pyanaconda/storage/__init__.py
	pyanaconda/storage/devicetree.py
	pyanaconda/storage/fcoe.py
	pyanaconda/storage/formats/swap.py
	pyanaconda/storage/iscsi.py
	pyanaconda/storage/partitioning.py
	pyanaconda/yuminstall.py
	scripts/makeupdates

1 files changed, 349 insertions, 4 deletions

diff --git a/anaconda.spec.in b/anaconda.spec.in
index 9a64c2002..143dbfd2e 100644
--- a/anaconda.spec.in
+++ b/anaconda.spec.in
@@ -125,10 +125,10 @@ Requires: cryptsetup-luks
 Requires: python-cryptsetup >= %{pythoncryptsetupver}
 Requires: mdadm
 Requires: lvm2
-Requires: util-linux-ng >= 2.15.1
+Requires: util-linux >= 2.15.1
 Requires: system-config-keyboard >= %{sckeyboardver}
 Requires: dbus-python
-Requires: cracklib-python
+Requires: python-pwquality
 Requires: python-bugzilla
 Requires: python-nss
 Requires: tigervnc-server-minimal
@@ -143,6 +143,7 @@ Requires: zenity
 %endif
 Requires: createrepo >= %{createrepover}
 Requires: squashfs-tools
+Requires: hfsplus-tools
 Requires: genisoimage >= %{genisoimagever}
 Requires: GConf2 >= %{gconfversion}
 %ifarch %{ix86} x86_64
@@ -163,6 +164,9 @@ Requires: fcoe-utils >= %{fcoeutilsver}
 %ifarch %{sparc}
 Requires: elftoaout piggyback
 %endif
+%ifarch x86_64
+Requires: mactel-boot
+%endif
 Obsoletes: anaconda-images <= 10
 Provides: anaconda-images = %{version}-%{release}
 Obsoletes: anaconda-runtime < %{version}-%{release}
@@ -192,6 +196,19 @@ This package contains libraries and header files needed for writing the anaconda
 installer.  It also contains Python and Glade support files, as well as
 documentation for working with this library.
 
+%package dracut
+Summary: The anaconda dracut module
+BuildArch: noarch
+Requires: dracut >= 16
+Requires: dracut-network
+Requires: xz
+Requires: pykickstart
+
+%description dracut
+The 'anaconda' dracut module handles installer-specific boot tasks and
+options. This includes driver disks, kickstarts, and finding the anaconda
+runtime on NFS/HTTP/FTP servers or local disks.
+
 %prep
 %setup -q
 
@@ -233,11 +250,12 @@ update-desktop-database &> /dev/null || :
 %doc docs/command-line.txt
 %doc docs/install-methods.txt
 %doc docs/mediacheck.txt
-%doc docs/anaconda-release-notes.txt
 /lib/systemd/system/*
+/lib/systemd/system-generators/*
 /lib/udev/rules.d/70-anaconda.rules
 %{_bindir}/instperf
 %{_sbindir}/anaconda
+%{_sbindir}/handle-sshpw
 %{_sbindir}/logpicker
 %ifarch i386 i486 i586 i686 x86_64
 %{_sbindir}/gptsync
@@ -247,7 +265,6 @@ update-desktop-database &> /dev/null || :
 %{_prefix}/libexec/anaconda
 %{_libdir}/python*/site-packages/pyanaconda/*
 %{_libdir}/python*/site-packages/log_picker/*
-%{_libdir}/anaconda*
 %{_bindir}/analog
 %{_bindir}/anaconda-cleanup
 %ifarch %livearches
@@ -272,7 +289,335 @@ update-desktop-database &> /dev/null || :
 %{_datadir}/glade/catalogs/AnacondaWidgets.xml
 %{_datadir}/gtk-doc
 
+%files dracut
+%dir /usr/lib/dracut/modules.d/80%{name}
+/usr/lib/dracut/modules.d/80%{name}/*
+
 %changelog
+* Wed Apr 18 2012 Brian C. Lane <bcl@redhat.com> - 18.2-1
+- Fixes from F17 branch
+
+* Mon Apr 09 2012 Brian C. Lane <bcl@redhat.com> - 17.20-1
+- make dev_is_mounted more reliable (wwoods)
+- fix failure to run multiple udev-triggered jobs (#811008) (wwoods)
+
+* Fri Apr 06 2012 Brian C. Lane <bcl@redhat.com> - 17.19-1
+- copy installer image to RAM during upgrades (#810391) (wwoods)
+- fix repo={hd,cdrom}:DEV:PATH (#810136) (wwoods)
+- read flags using filename globs (bcl)
+- Fix repo={http,ftp,nfs} (#810005) (wwoods)
+- Fix "memcheck=0" (and other store_true boot args) (wwoods)
+- write new options to zipl.conf (dan)
+
+* Tue Apr 03 2012 Brian C. Lane <bcl@redhat.com> - 17.18-1
+- Revert "Wait for device activation / "online" hook if rd.neednet is set"
+  (bcl)
+- Add missing os import to platform.py (bcl)
+
+* Tue Apr 03 2012 Brian C. Lane <bcl@redhat.com> - 17.17-1
+- Don't allow /usr as a separate partition (#804913) (clumens)
+- use /sys/class/dmi instead of dmidecode (bcl)
+- restore the GPT blacklist code (bcl)
+- add virtio rsyslogd logging to anaconda (bcl)
+- dracut/parse-kickstart: handle network --device=link (or none) (wwoods)
+- dracut: fix kssendmac/inst.ks.sendmac (wwoods)
+- Set ONBOOT=yes for at least one wired netdev by default (#806466) (wwoods)
+- detect live backing device (#809342) (dlehman)
+- Wait for device activation / "online" hook if rd.neednet is set (wwoods)
+- Fix kickstart failure if ks is on the same disk as stage2 (wwoods)
+- fix 'mount: Too many levels of symbolic links' error message (wwoods)
+- support {stage2,repo}=.../path/to/file.img (#808499) (wwoods)
+- dracut when_diskdev_appears: only run cmd once per device (wwoods)
+- dracut: don't do kickstart twice, don't use root.info (wwoods)
+- Don't use the bootloader config path to find the splash image (#807510)
+  (pjones)
+
+* Wed Mar 28 2012 Brian C. Lane <bcl@redhat.com> - 17.16-1
+- makeupdates: install liveinst to /usr/sbin (bcl)
+- liveinst: adjust updates path (#807397) (bcl)
+- dracut: add missing spaces for module loading (#804522) (bcl)
+- Don't set MALLOC_PERTURB_ when calling grub2-install. (workaround #806784)
+  (pjones)
+
+* Tue Mar 27 2012 Brian C. Lane <bcl@redhat.com> - 17.15-1
+- make ks=file:... parse kickstart earlier (#806931) (wwoods)
+- Let "root=..." override "repo=..." (wwoods)
+- dracut cleanup: use consistent filenames for cmdline.d files (wwoods)
+- fix "strsep: command not found" error with repo:hd:.. (#806966) (wwoods)
+- load modules needed by Anaconda (#804522) (bcl)
+- Fix nfs/nfsiso (NM handover problems / empty net.ifaces) (wwoods)
+- Format PReP partition (hamzy)
+
+* Thu Mar 22 2012 Brian C. Lane <bcl@redhat.com> - 17.14-1
+- Revert "dracut: use /run/install/source for repodir" (bcl)
+- Disable creation of btrfs filesystems aside from kickstart. (#787341)
+  (dlehman)
+- fix text mode KeyError crash (#804483) (wwoods)
+- Default to text-mode if 'console=XXX' was provided (#804506) (wwoods)
+- dracut startup: "Loading $product $version $arch installer..." (wwoods)
+- fix nfsiso:...:/path/to/filename.iso (#804515) (wwoods)
+- fix typo in makeupdates (bcl)
+- makeupdates: add support for updating systemd services/targets (wwoods)
+- disable warnings about boot options needing 'inst.XXX' (wwoods)
+- Create default ifcfg-* for each interface (#804504, #804716) (wwoods)
+- save ifcfg for every interface we bring up (wwoods)
+- Let systemd handle terminal setup, fix possible race with NM (wwoods)
+- Migrate PPC from Yaboot to Grub2 for Anaconda (hamzy)
+- dracut: fix anaconda-netroot for inst.repo=nfsiso:.. (wwoods)
+- dracut: accept inst.updates or updates for live.updates (wwoods)
+- makeupdates: put files the right places (wwoods)
+- dracut: use /run/install/source for repodir (wwoods)
+- read args from 80kickstart.conf (bcl)
+
+* Fri Mar 16 2012 Brian C. Lane <bcl@redhat.com> - 17.13-1
+- anaconda.service Wants=NetworkManager.service (wwoods)
+- make sure we save the network setup for any network device we used (wwoods)
+- make sure parse-kickstart's ifcfg files get copied to the system (wwoods)
+- fedora-import-state.service is in initscripts now (wwoods)
+- Add flag to disable available-memory check (for debugging etc.) (wwoods)
+- fix logic for setting set rd.{luks,dm,md,lvm}=0 (wwoods)
+- fix run_kickstart for the non-repo case (wwoods)
+- run_kickstart: go back to targeted cmdline parsing (wwoods)
+- parse-kickstart: write ifcfg files for all net devs (wwoods)
+- add the traditional anaconda dhcpclass (wwoods)
+- cleanups and fixes for ksdevice/bootdev handling (wwoods)
+- drop unused when_netdev_online function (wwoods)
+- make run_kickstart re-parse the whole commandline (wwoods)
+- set rd.{luks,dm,md,lvm}=0 unless the user says otherwise (wwoods)
+- handle inst.* cmdline args correctly (bcl)
+- fixup for syntax error in inst.ks/--kickstart patch (wwoods)
+- set ANACONDA=1 udev property in the right place (wwoods)
+- fix inst.ks handling in anaconda (wwoods)
+- fixups: run ks early, don't repeat netroot (wwoods)
+- fixup: "online" hook renamed "initqueue/online" upstream (wwoods)
+- Quiet bash error message if (optional) treeinfo is missing (wwoods)
+- a couple small cleanups/fixes for fedora-import-state.service (wwoods)
+- anaconda-shell service tweaks (wwoods)
+- add fedora-import-state.service (fix NFS root: #799989) (wwoods)
+- anaconda-netroot.sh: make sure dracut writes out the ifcfg files (wwoods)
+- Use "online" hook to handle anaconda network root devices (wwoods)
+- Fetch network kickstarts from the "online" hook (wwoods)
+- set wait_for_dev /dev/root in parse-anaconda-repo.sh (wwoods)
+- fix find_runtime() and parse_kickstart() (wwoods)
+- kickstart parsing fixups: keep running if parse fails (wwoods)
+- handle more KickstartErrors (wwoods)
+- anaconda-lib: make sure we only run when_*_online jobs once (wwoods)
+- add missing newline to /tmp/ks.info (wwoods)
+- don't source dracut-lib.sh twice (it causes crashes) (wwoods)
+- kickstart: only wait for kickstart if we're actually fetching it (wwoods)
+- fetch-kickstart-*: actually do run_kickstart (wwoods)
+- python-deps: cleanups/comments (wwoods)
+- replace pythondeps.sh with python-deps (python script) (wwoods)
+- move parse-kickstart.py back to parse-kickstart (wwoods)
+- Makefile.am: use dist_dracut_SCRIPTS to make scripts executable (wwoods)
+- fix bad path for parse-kickstart.py (wwoods)
+- refactor network handling (support ibft and ksdevice) (wwoods)
+- update Makefile.am (wwoods)
+- add fetch-kickstart-disk and fetch-kickstart-net (wwoods)
+- make cd autoprobe catchall rule actually run for each device (wwoods)
+- fix inst.repo=cdrom (wwoods)
+- move deprecation warnings into parse-anaconda-options.sh (wwoods)
+- add wait_for_kickstart() (wwoods)
+- parse-kickstart updates (wwoods)
+- anaconda-lib: rename check_isodir, add anaconda_live_root_dir (wwoods)
+- anaconda-{nfs,disk}root updates (wwoods)
+- split genrules into repo-genrules.sh and kickstart-genrules.sh (wwoods)
+- minor parse cleanups for kickstart and repo (wwoods)
+- improve handling of anaconda repo root stuff (wwoods)
+- parse-kickstart: return filename, drop biospart junk (wwoods)
+- make sure edd is loaded, if available (wwoods)
+- Drop dmidecode binary, just cat /sys/class/dmi/id/product_serial (wwoods)
+- dracut/anaconda-genrules.sh: add catch-all rule for autoprobing CDs (wwoods)
+- add more kickstart code, shuffle genrules code around (wwoods)
+- move disk_to_dev_path to anaconda-lib (wwoods)
+- edit anaconda-urlroot status messages (wwoods)
+- fix typo in anaconda-urlroot (wwoods)
+- add anaconda-urlroot (handle inst.repo=[http|ftp]) (wwoods)
+- whoops, forgot anaconda-lib.sh (wwoods)
+- dracut: check for .buildstamp in /run/initramfs (wwoods)
+- anaconda-dracut: make sure we execute pythondeps.sh (wwoods)
+- dumb typo fix: "convertfs", not "covertfs" (wwoods)
+- dracut: move to /usr/lib (wwoods)
+- dracut: depend on "convertfs" module (wwoods)
+- Make anaconda-dracut subpackage noarch (wwoods)
+- Add anaconda dracut module [WIP!] (wwoods)
+- Completely remove loader/ (wwoods)
+- We've got you cornered now, loader: remove from automake/spec/po (wwoods)
+- move linuxrc.s390 out of harm's way (wwoods)
+- move vncpassword handling into anaconda; remove recoverVNCPassword (wwoods)
+- Remove misc. references to loader (wwoods)
+- remove ancient anaconda-release-notes.txt (wwoods)
+- remove scripts/upd-initrd and scripts/upd-bootiso (wwoods)
+- Move from loader.service to anaconda.service (wwoods)
+- Schedule (no-op) btrfs format create actions. (#799154) (dlehman)
+- intelligently choose the window size (#800609) (bcl)
+- fix text upgrade bootloader dialog (#742207) (bcl)
+
+* Tue Mar 06 2012 Brian C. Lane <bcl@redhat.com> - 17.12-1
+- only allow GPT boot flag on EFI System partition (#746895) (bcl)
+- Add dracut args for /usr to bootloader (#787893) (bcl)
+- Make sure all kickstart partition reqs get appropriate weight setting.
+  (dlehman)
+- Fix test for unsupported format type in kickstart. (dlehman)
+- Update the fs size limit for ext3/ext4 from 8TB to 16TB. (dlehman)
+- Don't allow /boot on logical partition except for grub. (dlehman)
+- empty versions shouldn't be upgradable or traceback (#791317) (bcl)
+- Don't crash when broken md devices are present. (#731177) (dlehman)
+- Add missing definition of BTRFSError. (#796013) (dlehman)
+
+* Tue Feb 21 2012 Brian C. Lane <bcl@redhat.com> - 17.11-1
+- import using the right path to iutil (bcl)
+
+* Mon Feb 20 2012 Brian C. Lane <bcl@redhat.com> - 17.10-1
+- use a dracut shutdown hook to eject media (#787461) (bcl)
+- add dracut shutdown eject hook function (#787461) (bcl)
+- The createSuggested methods have changed name (#791204, #795058). (clumens)
+- Generate repo= ks command only for repos added by user (#738577) (rvykydal)
+- Use libpwquality to check root password strength (#755883) (mgracik)
+- Generate connection UUID in inital ifcfg files created by anaconda (#705328)
+  (rvykydal)
+- Take in change of a binary name (brcm_iscsiuio -> iscsiuio) (#731761)
+  (rvykydal)
+- Set ONBOOT=yes for FCoE devices (#755147) (rvykydal)
+- Fix a typo (#794504). (clumens)
+- Add support for network --device=link in stage2 kickstart (#790332)
+  (rvykydal)
+- Set default lang and create default locale files early (wwoods)
+- Add 'traceback' boot option for python-meh and libreport testing (vpodzime)
+
+* Thu Feb 16 2012 Brian C. Lane <bcl@redhat.com> - 17.9-1
+- Don't set the pmbr bootable flag on Macs, whether booted via EFI or not (mjg)
+- Don't set GPT HFS+ partitions as bootable (mjg)
+- Mark HFS+ as fsckable (mjg)
+- fix setattr in set_cmdline_bool (pschindl)
+- Add _mounttype to HFSPlus (mjg)
+- Add support for UEFI Mac installs (mjg)
+- Add support for HFS+ partitions (mjg)
+
+* Mon Feb 13 2012 Brian C. Lane <bcl@redhat.com> - 17.8-1
+- Clear partitions' metadata when 'clearpart --initlabel' used. (#783841)
+  (cherry picked from commit 15307cc091212cc69b599b90c239492c9c9586ec)
+  (dlehman)
+- Fix support for detecting existing mirrored lvs. (#734128) (dlehman)
+- fix potential EFIGRUB infinite loop (bcl)
+- finish ROOT_PATH changes in bootloader (#789169) (bcl)
+- Be more verbose about upgrade failures (#735060) (bcl)
+- Skip setting PMBR boot flag on EFI (#754850) (mjg)
+- Updated transifex config for f17-branch (bcl)
+
+* Wed Feb 08 2012 Brian C. Lane <bcl@redhat.com> - 17.7-1
+- anaconda_optparse.py: a new OptionParser that also reads boot args (wwoods)
+- Add flags.set_cmdline_bool and flags.read_cmdline (wwoods)
+- flags.py: add new BootArgs() object for dealing with boot args (wwoods)
+- flags.py: rework/cleanup Flags object (wwoods)
+- fix serial console option parsing (#767745) (wwoods)
+- run convertfs on upgrade (#787893) (bcl)
+- check if stdout and stderr are the same in execWithRedirect and open the file
+  only once in such cases (mmatsuya)
+- Disable ipv6 on target system when using noipv6 option (#735791) (rvykydal)
+
+* Mon Feb 06 2012 Brian C. Lane <bcl@redhat.com> - 17.6-1
+- Set the boot flag on the GPT PMBR (#754850) (bcl)
+- Add missing _boot_description values for dasd and zfcp (#739620) (dcantrell)
+- Select the same device for ksdevice=link in loader and stage2 (#760250)
+  (rvykydal)
+
+* Wed Feb 01 2012 Brian C. Lane <bcl@redhat.com> - 17.5-1
+- Add a separate function to get an LV's VG name. (dlehman)
+- util-linux-ng is now util-linux (bcl)
+
+* Tue Jan 31 2012 Brian C. Lane <bcl@redhat.com> - 17.4-1
+- liveinst: canonicalize live-baseloop symlink (bcl)
+- Fixup getDeviceBy* methods (bcl)
+- Ignore dm devs when scanning for mpath members (#761278) (hamzy)
+- Don't set the system's hostname during disk image installs. (dlehman)
+- Fix error handling in the case of no live block device. (dlehman)
+- Force simple filter for disk image installs. (#784560) (dlehman)
+- Check for live install before doing live-specific umounts. (dlehman)
+- DM_VG_NAME tells an LV's VG, not the VG a PV belongs to. (#772878) (dlehman)
+
+* Mon Jan 23 2012 Brian C. Lane <bcl@redhat.com> - 17.3-1
+- Add missing log import to platform.py (bcl)
+- liveinst: Check for live-baseloop LIVE_BLOCK (bcl)
+- Add Storage.autoPartType to indicate lvm/btrfs/neither. (dlehman)
+- Add full support for btrfs via kickstart's btrfs command. (dlehman)
+- Show btrfs vols/subvols but don't allow editing them. (dlehman)
+- Add support for btrfs to the devicetree. (dlehman)
+- Remove an old hack with action registration. (dlehman)
+- Add support for btrfs automatic partitioning. (dlehman)
+- Add new field to PartSpec to indicate btrfs reqs. (dlehman)
+- Add btrfs convenience methods to Storage. (dlehman)
+- Handle device name generation and checking in a more generic way. (dlehman)
+- Add btrfs base class along with classes for volume, subvolume. (dlehman)
+- btrfs volumes/subvolumes are created by devicelibs.btrfs. (dlehman)
+- Scan for btrfs while looking a new devices. (dlehman)
+- Add backend module for operating on btrfs volumes. (dlehman)
+- Fix default hostname function to never return '(none)'. (dlehman)
+- Revert "Put bios boot partitions on all gpt disk on bios systems. (#738964)"
+  (dlehman)
+- Put NoSuchGroup and DispatchError back, but not in errors.py. (#760786)
+  (dlehman)
+- Clean up BootLoader.writeKS to account for no bootloader. (dlehman)
+- Fix sense of disklabel size check and add some logging. (dlehman)
+- Handle v0.90 md metadata in preexisting arrays. (dlehman)
+- style cleanups for ppc SMS bios patch (wwoods)
+- Update ppc SMS bios after installation (hamzy)
+- report more detail about yum failure (bcl)
+- Add a script mode that exits instead of looping (bcl)
+- Add 'sound-and-video' to Fedora install class for 'Software Development'
+  task. (#643786) (notting)
+- Unmount the image file (bcl)
+- Disable yum log file handling (bcl)
+- Setup storage config when kickstart is parsed (bcl)
+
+* Tue Nov 15 2011 Chris Lumens <clumens@redhat.com> - 17.2-1
+- ARCHIVE_DEFAULT_BYTES_PER_BLOCK no longer exists in libarchive-3.0.0
+  (clumens)
+- Don't use the rpmdb to figure out upgrade target arch (#748119). (clumens)
+- Remove obsolete error handling left over from the old storage code. (dlehman)
+- Update to the FC16_VolGroupData so reserving space works. (dlehman)
+- Remove unused import of gzip from task_gui.py (dlehman)
+- Cap new /boot/efi partitions at 200MB. (#748274) (dlehman)
+- Fix root device specification in zipl.conf. (#740576) (dlehman)
+- Add --boot-drive option to kickstart bootloader command. (dlehman)
+- Include disklabel type in grub2 device names. (dlehman)
+- use 800x600 as minimal mainWindow size (vpodzime) (mgracik)
+- Use an atexit handler for shutting down and ejecting media (#750809).
+  (clumens)
+- Fix a dumb error when canceling previous migration actions (#744034).
+  (clumens)
+- Document iscsi and multipath implementations. (akozumpl)
+- Don't load forcefully load pcspkr.  The kernel doesn't (#750830). (clumens)
+- Gray out "Configure Network" button in live installations (#749929)
+  (rvykydal)
+- Support prefix length in kickstart network --ipv6 option. (rvykydal)
+- Support prefix length in ipv6= cmdline option (#679108) (rvykydal)
+- Remove snarffont, which is no longer needed. (clumens)
+- Change what the third column of lang-table means. (clumens)
+- And stop attempting to load our own fonts, since we no longer ship them.
+  (clumens)
+- Remove our own screen fonts (#742613, #743429). (clumens)
+- Don't use GPT disklabels on Lenovo BIOS systems. (#749325) (dlehman)
+- Fix typo in call to opt.isdigit (#743787) (pjones)
+- Don't allow disks containing the live media as boot disk. (#748587) (dlehman)
+- Honor fsprofile argument even for existing devices. (#747417) (dlehman)
+- Regenerate tasklist when a repo is removed. (akozumpl)
+- Do a better job of remembering if 'review and modify partitioning' was
+  checked. (akozumpl)
+- Be more convincing in eradicating errant temp vg paths. (#722952) (dlehman)
+- Resize: Update format size if aligning partition shrinks it. (#689179)
+  (dlehman)
+- Copy all of live filesystem to target (#746844) (bcl)
+- Fix autopart shrink of existing system. (#746605) (dlehman)
+- cryptsetup returns positive nonzero when activating by different than the
+  first keyslot (msivak)
+- do more logging in findExistingRootDevices() (akozumpl)
+- Add 'nogpt' cmdline arg to disable creation of gpt disklabels. (dlehman)
+- Show cleardisks gui always to allow selecting a boot disk. (#744088)
+  (dlehman)
+- mpath: flush more eagerly in filter_gui. (akozumpl)
+- debugging: log boot arguments. (akozumpl)
+
 * Tue Oct 11 2011 Chris Lumens <clumens@redhat.com> - 17.1-1
 - Pull grub-efi and efibootmgr into the package list as needed. (#742042)
   (pjones)