summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2006-02-07 02:21:54 +0000
committerJeremy Katz <katzj@redhat.com>2006-02-07 02:21:54 +0000
commit01a8e3bb8151b9dde37dca7977fc475251977f4d (patch)
tree007dd0a33e9a1f46b55d2e8928c097bd8c9c80f1
parentcd5dce638231092094366632593bd3ea9321b44a (diff)
downloadanaconda-01a8e3bb8151b9dde37dca7977fc475251977f4d.tar.gz
anaconda-01a8e3bb8151b9dde37dca7977fc475251977f4d.tar.xz
anaconda-01a8e3bb8151b9dde37dca7977fc475251977f4d.zip
2006-02-06 Jeremy Katz <katzj@redhat.com>
* backend.py (writeConfiguration): Include writing out instdata so that things like root password, etc all work again (#180310) * dispatch.py (installSteps): Pass id and instPath to writeconfig again
-rw-r--r--ChangeLog7
-rw-r--r--backend.py3
-rw-r--r--dispatch.py5
3 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ae8805355..6dddf4eaa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2006-02-06 Jeremy Katz <katzj@redhat.com>
+ * backend.py (writeConfiguration): Include writing out instdata so
+ that things like root password, etc all work again (#180310)
+
+ * dispatch.py (installSteps): Pass id and instPath to writeconfig again
+
+2006-02-06 Jeremy Katz <katzj@redhat.com>
+
* anaconda.spec: Bump version.
* fsset.py (FileSystemSet.mkDevRoot): Don't create it if it
diff --git a/backend.py b/backend.py
index d1b48193f..52d644720 100644
--- a/backend.py
+++ b/backend.py
@@ -164,8 +164,9 @@ def doBasePackageSelect(backend, instClass):
instClass.setPackageSelection(backend)
instClass.setGroupSelection(backend)
-def writeConfiguration(backend):
+def writeConfiguration(backend, id, instPath):
log.info("Writing main configuration")
if not flags.test:
backend.writeConfiguration()
+ id.write(instPath)
diff --git a/dispatch.py b/dispatch.py
index 841c3f2c7..3ccd7433b 100644
--- a/dispatch.py
+++ b/dispatch.py
@@ -59,6 +59,9 @@ log = logging.getLogger("anaconda")
# in the second case, the function is called directly from the dispatcher
installSteps = [
+ ("networkdevicecheck", networkDeviceCheck, ("id.network", "dispatch")),
+ ("network", ("id.network", "dir", "intf", "id")),
+
("welcome", ()),
("betanag", betaNagScreen, ("intf", "dir")),
("language", ("intf", "id.instLanguage")),
@@ -120,7 +123,7 @@ installSteps = [
("preinstallconfig", doPreInstall, ("backend", "intf", "id", "instPath", "dir")),
("installpackages", doInstall, ("backend", "intf", "id", "instPath")),
("postinstallconfig", doPostInstall, ("backend", "intf", "id", "instPath")),
- ("writeconfig", writeConfiguration, ("backend",)),
+ ("writeconfig", writeConfiguration, ("backend", "id", "instPath")),
("firstboot", firstbootConfiguration, ("id", "instPath")),
("instbootloader", writeBootloader, ("intf", "instPath", "id.fsset",
"id.bootloader", "id.instLanguage",