On Thu, 2012-05-03 at 11:20 -0400, Chris Lumens wrote:
> > diff --git a/pykickstart/handlers/control.py b/pykickstart/handlers/control.py
> > index 7901ce3..a4af58b 100644
> > --- a/pykickstart/handlers/control.py
> > +++ b/pykickstart/handlers/control.py
> > @@ -884,6 +884,67 @@ commandMap = {
> > "zfcp": zfcp.F14_ZFCP,
> > },
> >
> > + # based on f17
> > + F18: {
> > + "auth": authconfig.FC3_Authconfig,
> > + "authconfig": authconfig.FC3_Authconfig,
> > + "autopart": autopart.F17_AutoPart,
> > + "autostep": autostep.FC3_AutoStep,
> > + "bootloader": bootloader.F17_Bootloader,
> > + "btrfs": btrfs.F17_BTRFS,
> > + "cdrom": method.F14_Method,
> > + "clearpart": clearpart.F17_ClearPart,
> > + "cmdline": displaymode.FC3_DisplayMode,
> > + "device": device.F8_Device,
> > + "deviceprobe": deviceprobe.FC3_DeviceProbe,
> > + "dmraid": dmraid.FC6_DmRaid,
> > + "driverdisk": driverdisk.F14_DriverDisk,
> > + "fcoe": fcoe.F13_Fcoe,
> > + "firewall": firewall.F14_Firewall,
> > + "firstboot": firstboot.FC3_Firstboot,
> > + "graphical": displaymode.FC3_DisplayMode,
> > + "group": group.F12_Group,
> > + "halt": reboot.FC6_Reboot,
> > + "harddrive": method.F14_Method,
> > + "ignoredisk": ignoredisk.F14_IgnoreDisk,
> > + "install": upgrade.F11_Upgrade,
> > + "iscsi": iscsi.F17_Iscsi,
> > + "iscsiname": iscsiname.FC6_IscsiName,
> > + "keyboard": keyboard.F18_Keyboard,
> > + "lang": lang.FC3_Lang,
> > + "logging": logging.FC6_Logging,
> > + "logvol": logvol.F17_LogVol,
> > + "mediacheck": mediacheck.FC4_MediaCheck,
> > + "monitor": monitor.F10_Monitor,
> > + "multipath": multipath.FC6_MultiPath,
> > + "network": network.F16_Network,
> > + "nfs": method.F14_Method,
> > + "part": partition.F17_Partition,
> > + "partition": partition.F17_Partition,
> > + "poweroff": reboot.FC6_Reboot,
> > + "raid": raid.F15_Raid,
> > + "reboot": reboot.FC6_Reboot,
> > + "repo": repo.F15_Repo,
> > + "rescue": rescue.F10_Rescue,
> > + "rootpw": rootpw.F8_RootPw,
> > + "selinux": selinux.FC3_SELinux,
> > + "services": services.FC6_Services,
> > + "shutdown": reboot.FC6_Reboot,
> > + "skipx": skipx.FC3_SkipX,
> > + "sshpw": sshpw.F13_SshPw,
> > + "text": displaymode.FC3_DisplayMode,
> > + "timezone": timezone.FC6_Timezone,
> > + "updates": updates.F7_Updates,
> > + "upgrade": upgrade.F11_Upgrade,
> > + "url": method.F14_Method,
> > + "user": user.F12_User,
> > + "vnc": vnc.F9_Vnc,
> > + "volgroup": volgroup.FC16_VolGroup,
> > + "xconfig": xconfig.F14_XConfig,
> > + "zerombr": zerombr.F9_ZeroMbr,
> > + "zfcp": zfcp.F14_ZFCP,
> > + },
> > +
> > # based on fc1
> > RHEL3: {
> > "auth": authconfig.FC3_Authconfig,
>
> Please merge this with the other pykickstart patch, and then do a git
> rebase --interactive HEAD~3 to reorder them and put the F18 patch first.
> Picky, I know.
How can I merge them and then reorder them (after they become only one)?
Or should I merge the F18 stuff and leave changes to the keyboard
command as a separate patch and then reorder them?
--
Vratislav Podzimek
Anaconda Rider | Red Hat, Inc. | Brno - Czech Republic
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
