Author: locilka
Date: Sat Mar 15 02:40:28 2008
New Revision: 45482
URL: http://svn.opensuse.org/viewcvs/yast?rev=45482&view=rev
Log:
- Added new client inst_rpmcopy_secondstage that calls inst_rpmcopy
because of DisabledModules disabling both first and second stage
occurency of that script.
- Changed control file to call the new script in second stage.
- 2.16.22
Added:
trunk/installation/src/clients/inst_rpmcopy_secondstage.ycp
Modified:
trunk/installation/VERSION
trunk/installation/control/control.SLD.xml
trunk/installation/control/control.SLES.xml
trunk/installation/control/control.openSUSE.xml
trunk/installation/control/control.xml
trunk/installation/package/yast2-installation.changes
Modified: trunk/installation/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=45482&r1=45481&r2=45482&view=diff
==============================================================================
--- trunk/installation/VERSION (original)
+++ trunk/installation/VERSION Sat Mar 15 02:40:28 2008
@@ -1 +1 @@
-2.16.21
+2.16.22
Modified: trunk/installation/control/control.SLD.xml
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLD.xml?rev=45482&r1=45481&r2=45482&view=diff
==============================================================================
--- trunk/installation/control/control.SLD.xml (original)
+++ trunk/installation/control/control.SLD.xml Sat Mar 15 02:40:28 2008
@@ -551,7 +551,7 @@
<modules config:type="list">
<module>
<label>Perform Update</label>
- <name>rpmcopy</name>
+ <name>rpmcopy_secondstage</name>
</module>
<module>
<heading>yes</heading>
@@ -644,7 +644,7 @@
</module>
<module>
<label>Check Installation</label>
- <name>rpmcopy</name>
+ <name>rpmcopy_secondstage</name>
no
no
</module>
@@ -794,7 +794,7 @@
</module>
<module>
<label>Perform Installation</label>
- <name>rpmcopy</name>
+ <name>rpmcopy_secondstage</name>
</module>
<module>
<heading>yes</heading>
Modified: trunk/installation/control/control.SLES.xml
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLES.xml?rev=45482&r1=45481&r2=45482&view=diff
==============================================================================
--- trunk/installation/control/control.SLES.xml (original)
+++ trunk/installation/control/control.SLES.xml Sat Mar 15 02:40:28 2008
@@ -673,7 +673,7 @@
<modules config:type="list">
<module>
<label>Perform Update</label>
- <name>rpmcopy</name>
+ <name>rpmcopy_secondstage</name>
</module>
<module>
<heading>yes</heading>
@@ -785,7 +785,7 @@
</module>
<module>
<label>Check Installation</label>
- <name>rpmcopy</name>
+ <name>rpmcopy_secondstage</name>
no
no
</module>
@@ -962,7 +962,7 @@
</module>
<module>
<label>Perform Installation</label>
- <name>rpmcopy</name>
+ <name>rpmcopy_secondstage</name>
</module>
<module>
<heading>yes</heading>
Modified: trunk/installation/control/control.openSUSE.xml
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.openSUSE.xml?rev=45482&r1=45481&r2=45482&view=diff
==============================================================================
--- trunk/installation/control/control.openSUSE.xml (original)
+++ trunk/installation/control/control.openSUSE.xml Sat Mar 15 02:40:28 2008
@@ -553,7 +553,7 @@
<modules config:type="list">
<module>
<label>Perform Update</label>
- <name>rpmcopy</name>
+ <name>rpmcopy_secondstage</name>
no
no
</module>
@@ -638,7 +638,7 @@
</module>
<module>
<label>Check Installation</label>
- <name>rpmcopy</name>
+ <name>rpmcopy_secondstage</name>
no
no
</module>
@@ -786,7 +786,7 @@
</module>
<module>
<label>Perform Installation</label>
- <name>rpmcopy</name>
+ <name>rpmcopy_secondstage</name>
</module>
<module>
<heading>yes</heading>
Modified: trunk/installation/control/control.xml
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.xml?rev=45482&r1=45481&r2=45482&view=diff
==============================================================================
--- trunk/installation/control/control.xml (original)
+++ trunk/installation/control/control.xml Sat Mar 15 02:40:28 2008
@@ -505,7 +505,7 @@
<modules config:type="list">
<module>
<label>Perform Update</label>
- <name>rpmcopy</name>
+ <name>rpmcopy_secondstage</name>
</module>
<module>
<heading>yes</heading>
@@ -577,7 +577,7 @@
</module>
<module>
<label>Perform Installation</label>
- <name>rpmcopy</name>
+ <name>rpmcopy_secondstage</name>
no
no
</module>
@@ -732,7 +732,7 @@
</module>
<module>
<label>Perform Installation</label>
- <name>rpmcopy</name>
+ <name>rpmcopy_secondstage</name>
</module>
<module>
<heading>yes</heading>
Modified: trunk/installation/package/yast2-installation.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=45482&r1=45481&r2=45482&view=diff
==============================================================================
--- trunk/installation/package/yast2-installation.changes (original)
+++ trunk/installation/package/yast2-installation.changes Sat Mar 15 02:40:28 2008
@@ -6,6 +6,11 @@
- Adjusted RPM dependencies.
- Creating and removing the file runme_at_boot is currently handled
by YaST (YCP) installation scripts.
+- Added new client inst_rpmcopy_secondstage that calls inst_rpmcopy
+ because of DisabledModules disabling both first and second stage
+ occurency of that script.
+- Changed control file to call the new script in second stage.
+- 2.16.22
-------------------------------------------------------------------
Mon Mar 10 11:25:57 CET 2008 - locilka@suse.cz
Added: trunk/installation/src/clients/inst_rpmcopy_secondstage.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_rpmcopy_secondstage.ycp?rev=45482&view=auto
==============================================================================
--- trunk/installation/src/clients/inst_rpmcopy_secondstage.ycp (added)
+++ trunk/installation/src/clients/inst_rpmcopy_secondstage.ycp Sat Mar 15 02:40:28 2008
@@ -0,0 +1,11 @@
+/**
+ * This client just calls inst_rpmcopy and returns the result.
+ * If automatic installation is used, inst_rpmcopy is disabled,
+ * which not only diables it in second stage (wanted) but also
+ * disables it in first stage.
+ * This client is used in second stage.
+ */
+
+{
+ return WFM::CallFunction ("inst_rpmcopy", WFM::Args());
+}
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
