1 |
slords |
1.1 |
From 71fb8066cc9470284efac2d3edbf9d6c1abe2666 Mon Sep 17 00:00:00 2001 |
2 |
|
|
From: Shad L. Lords <slords@mail.com> |
3 |
|
|
Date: Mon, 26 Oct 2009 18:50:48 -0600 |
4 |
|
|
Subject: [PATCH] Add interface method to post action |
5 |
|
|
|
6 |
|
|
--- |
7 |
|
|
dispatch.py | 2 +- |
8 |
|
|
installclass.py | 2 +- |
9 |
|
|
kickstart.py | 2 +- |
10 |
|
|
packages.py | 4 ++-- |
11 |
|
|
4 files changed, 5 insertions(+), 5 deletions(-) |
12 |
|
|
|
13 |
|
|
diff --git a/dispatch.py b/dispatch.py |
14 |
|
|
index c7f1990..e9cda5b 100644 |
15 |
|
|
--- a/dispatch.py |
16 |
|
|
+++ b/dispatch.py |
17 |
|
|
@@ -155,7 +155,7 @@ installSteps = [ |
18 |
|
|
("writeksconfig", writeKSConfiguration, ("id", "instPath")), |
19 |
|
|
("setfilecon", setFileCons, ("instPath","id.partitions")), |
20 |
|
|
("copylogs", copyAnacondaLogs, ("instPath",)), |
21 |
|
|
- ("dopostaction", doPostAction, ("id", "instPath")), |
22 |
|
|
+ ("dopostaction", doPostAction, ("id", "instPath", "intf")), |
23 |
|
|
("methodcomplete", doMethodComplete, ("method",)), |
24 |
|
|
("complete", ()), |
25 |
|
|
] |
26 |
|
|
diff --git a/installclass.py b/installclass.py |
27 |
|
|
index 0e98229..91c8d56 100644 |
28 |
|
|
--- a/installclass.py |
29 |
|
|
+++ b/installclass.py |
30 |
|
|
@@ -63,7 +63,7 @@ class BaseInstallClass: |
31 |
|
|
# we can use a different install data class |
32 |
|
|
installDataClass = InstallData |
33 |
|
|
|
34 |
|
|
- def postAction(self, rootPath, serial): |
35 |
|
|
+ def postAction(self, rootPath, serial, intf): |
36 |
|
|
pass |
37 |
|
|
|
38 |
|
|
def setBootloader(self, id, useLilo=0, location=None, linear=1, |
39 |
|
|
diff --git a/kickstart.py b/kickstart.py |
40 |
|
|
index d88f46f..c4b67a6 100644 |
41 |
|
|
--- a/kickstart.py |
42 |
|
|
+++ b/kickstart.py |
43 |
|
|
@@ -98,7 +98,7 @@ class Script: |
44 |
|
|
class KickstartBase(BaseInstallClass): |
45 |
|
|
name = "kickstart" |
46 |
|
|
|
47 |
|
|
- def postAction(self, rootPath, serial): |
48 |
|
|
+ def postAction(self, rootPath, serial, intf): |
49 |
|
|
log("Running kickstart %%post script(s)") |
50 |
|
|
for script in self.postScripts: |
51 |
|
|
script.run(rootPath, serial) |
52 |
|
|
diff --git a/packages.py b/packages.py |
53 |
|
|
index 629b04b..48827d8 100644 |
54 |
|
|
--- a/packages.py |
55 |
|
|
+++ b/packages.py |
56 |
|
|
@@ -55,8 +55,8 @@ def queryUpgradeContinue(intf, dir): |
57 |
|
|
sys.exit(0) |
58 |
|
|
return DISPATCH_FORWARD |
59 |
|
|
|
60 |
|
|
-def doPostAction(id, instPath): |
61 |
|
|
- id.instClass.postAction(instPath, flags.serial) |
62 |
|
|
+def doPostAction(id, instPath, intf): |
63 |
|
|
+ id.instClass.postAction(instPath, flags.serial, intf) |
64 |
|
|
|
65 |
|
|
def firstbootConfiguration(id, instPath): |
66 |
|
|
if id.firstboot == FIRSTBOOT_RECONFIG: |
67 |
|
|
-- |
68 |
|
|
1.5.5.6 |
69 |
|
|
|