> diff --git a/dispatch.py b/dispatch.py
> index 5bcaab9..a4029d9 100644
> --- a/dispatch.py
> +++ b/dispatch.py
> @@ -36,6 +36,7 @@ from storage.partitioning import doAutoPartition
> from bootloader import writeBootloader, bootloaderSetupChoices
> from flags import flags
> from upgrade import upgradeMountFilesystems
> +from upgrade import upgradeSetupTime
> from upgrade import upgradeSwapSuggestion, upgradeMigrateFind
> from upgrade import findRootParts, queryUpgradeContinue
> from installmethod import doMethodComplete
> @@ -83,6 +84,7 @@ installSteps = [
> ("autopartitionexecute", doAutoPartition, ),
> ("partition", ),
> ("upgrademount", upgradeMountFilesystems, ),
> + ("upgradesetuptime", upgradeSetupTime, ),
> ("upgradecontinue", queryUpgradeContinue, ),
> ("upgradeswapsuggestion", upgradeSwapSuggestion, ),
> ("addswap", ),
All the dispatch stuff looks fine.
> +def upgradeSetupTime(anaconda):
> + """Load time setup for upgrade install.
> +
> + This is pretty much what packages.setupTimezone() does in reverse.
> + """
> + if anaconda.dir == DISPATCH_BACK:
> + return
> + if os.environ.has_key("TZ"):
> + del os.environ["TZ"]
> + copyFromSysimage(anaconda.rootPath, '/etc/localtime')
> + copyFromSysimage(anaconda.rootPath, '/etc/adjtime')
> + if iutil.isS390():
> + return
> + args = [ "--hctosys" ]
> + try:
> + iutil.execWithRedirect("/usr/sbin/hwclock", args,stdout = "/dev/tty5",
> + stderr = "/dev/tty5")
> + except RuntimeError:
> + log.error("Failed to set the clock.")
It'd be nice if you broke this up logically with some blank lines.
- Chris
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
