]> git.ipfire.org Git - people/ms/ipfire-3.x.git/commit
Merge branch 'installer-v2'
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 10 Apr 2010 14:43:03 +0000 (16:43 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 10 Apr 2010 14:43:03 +0000 (16:43 +0200)
commit1ba4ef5f5afa90389ee3fe22d208335bac4fe15a
treecba682596f7fded5630554d62fbfe5ea4b8dca52
parent891c03a61a1ea84543073a4ac2d7aa4063d67b4c
parente3b623d3494146def613c28c3bada99c58eb4ade
Merge branch 'installer-v2'

Conflicts:
lfs/python-parted
lfs/wireless-tools
pkgs/core/pomona/src/autopart.py
pkgs/core/pomona/src/backend.py
pkgs/core/pomona/src/bootloader.py
pkgs/core/pomona/src/cryptodev.py
pkgs/core/pomona/src/dmraid.py
pkgs/core/pomona/src/errors.py
pkgs/core/pomona/src/flags.py
pkgs/core/pomona/src/fsset.py
pkgs/core/pomona/src/installer.py
pkgs/core/pomona/src/instdata.py
pkgs/core/pomona/src/isys/devices.c
pkgs/core/pomona/src/isys/devices.h
pkgs/core/pomona/src/isys/eddsupport.c
pkgs/core/pomona/src/isys/eddsupport.h
pkgs/core/pomona/src/isys/ethtool.c
pkgs/core/pomona/src/isys/imount.c
pkgs/core/pomona/src/isys/imount.h
pkgs/core/pomona/src/isys/isofs.c
pkgs/core/pomona/src/isys/lang.c
pkgs/core/pomona/src/isys/lang.h
pkgs/core/pomona/src/isys/linkdetect.c
pkgs/core/pomona/src/isys/net.h
pkgs/core/pomona/src/isys/smp.c
pkgs/core/pomona/src/isys/smp.h
pkgs/core/pomona/src/isys/str.c
pkgs/core/pomona/src/isys/str.h
pkgs/core/pomona/src/isys/stubs.h
pkgs/core/pomona/src/isys/sundries.h
pkgs/core/pomona/src/isys/vio.c
pkgs/core/pomona/src/isys/wireless.c
pkgs/core/pomona/src/isys/wireless.h
pkgs/core/pomona/src/iutil.py
pkgs/core/pomona/src/keyboard_models.py
pkgs/core/pomona/src/lvm.py
pkgs/core/pomona/src/network.py
pkgs/core/pomona/src/packages.py
pkgs/core/pomona/src/pakfireinstall.py
pkgs/core/pomona/src/partErrors.py
pkgs/core/pomona/src/partIntfHelpers.py
pkgs/core/pomona/src/partRequests.py
pkgs/core/pomona/src/partedUtils.py
pkgs/core/pomona/src/partitioning.py
pkgs/core/pomona/src/partitions.py
pkgs/core/pomona/src/pomona_log.py
pkgs/core/pomona/src/raid.py
pkgs/core/pomona/src/scripts/getlangnames.py
pkgs/core/pomona/src/timezone.py
pkgs/core/pomona/src/tui.py
pkgs/core/pomona/src/tui_bootloader.py
pkgs/core/pomona/src/tui_complete.py
pkgs/core/pomona/src/tui_confirm.py
pkgs/core/pomona/src/tui_keyboard.py
pkgs/core/pomona/src/tui_language.py
pkgs/core/pomona/src/tui_network.py
pkgs/core/pomona/src/tui_partition.py
pkgs/core/pomona/src/tui_progress.py
pkgs/core/pomona/src/tui_timezone.py
pkgs/core/pomona/src/tui_userauth.py
pkgs/core/pomona/src/tui_welcome.py
pkgs/core/pomona/src/users.py
pkgs/core/pomona/src/zonetab.py
src/pomona/Makefile.inc
src/pomona/isys/Makefile
src/pomona/isys/imount.c
src/pomona/isys/mount.c
src/pomona/pomona
src/rootfiles/core/python-parted
43 files changed:
.gitignore
pkgs/core/pomona/src/Makefile
pkgs/core/pomona/src/Makefile.inc
pkgs/core/pomona/src/console.py
pkgs/core/pomona/src/constants.py
pkgs/core/pomona/src/datastore.py
pkgs/core/pomona/src/dispatch.py
pkgs/core/pomona/src/exception.py
pkgs/core/pomona/src/isys/Makefile
pkgs/core/pomona/src/isys/isys.c
pkgs/core/pomona/src/isys/isys.h
pkgs/core/pomona/src/isys/isys.py
pkgs/core/pomona/src/isys/mount.c
pkgs/core/pomona/src/isys/mount.h
pkgs/core/pomona/src/keyboard.py
pkgs/core/pomona/src/language.py
pkgs/core/pomona/src/log.py
pkgs/core/pomona/src/partition.py
pkgs/core/pomona/src/po/Makefile
pkgs/core/pomona/src/pomona
pkgs/core/pomona/src/pomona.py
pkgs/core/pomona/src/pychecker-false-positives
pkgs/core/pomona/src/runpychecker.sh
pkgs/core/pomona/src/storage/__init__.py
pkgs/core/pomona/src/storage/deviceaction.py
pkgs/core/pomona/src/storage/devicelibs/__init__.py
pkgs/core/pomona/src/storage/devicelibs/crypto.py
pkgs/core/pomona/src/storage/devicelibs/lvm.py
pkgs/core/pomona/src/storage/devicelibs/swap.py
pkgs/core/pomona/src/storage/devices.py
pkgs/core/pomona/src/storage/devicetree.py
pkgs/core/pomona/src/storage/errors.py
pkgs/core/pomona/src/storage/formats/__init__.py
pkgs/core/pomona/src/storage/formats/fs.py
pkgs/core/pomona/src/storage/formats/luks.py
pkgs/core/pomona/src/storage/formats/lvmpv.py
pkgs/core/pomona/src/storage/formats/swap.py
pkgs/core/pomona/src/storage/partitioning.py
pkgs/core/pomona/src/storage/udev.py
pkgs/core/pomona/src/text.py
pkgs/core/pomona/src/util.py
pkgs/core/pomona/src/windows.py
tools/py-compile