Author: locilka
Date: Mon Oct 15 13:07:57 2007
New Revision: 41420
URL: http://svn.opensuse.org/viewcvs/yast?rev=41420&view=rev
Log:
- Changing location of migration control file to /etc/SLEPOS.
- Adding real-data migration configuration.
- Proposing to skip migration if nothing to migrate is available.
- 2.13.2
Modified:
trunk/pos-installation/VERSION
trunk/pos-installation/control/Makefile.am
trunk/pos-installation/control/slepos_migration.xml
trunk/pos-installation/package/yast2-pos-installation.changes
trunk/pos-installation/src/clients/inst_slepos_data_migration.ycp
trunk/pos-installation/yast2-pos-installation.spec.in
Modified: trunk/pos-installation/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/VERSION?rev=41420&r1=41419&r2=41420&view=diff
==============================================================================
--- trunk/pos-installation/VERSION (original)
+++ trunk/pos-installation/VERSION Mon Oct 15 13:07:57 2007
@@ -1 +1 @@
-2.13.1
+2.13.2
Modified: trunk/pos-installation/control/Makefile.am
URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/control/Makefile.am?rev=41420&r1=41419&r2=41420&view=diff
==============================================================================
--- trunk/pos-installation/control/Makefile.am (original)
+++ trunk/pos-installation/control/Makefile.am Mon Oct 15 13:07:57 2007
@@ -2,7 +2,7 @@
#
SUBDIRS =
-controldir = /etc/YaST2
+controldir = /etc/SLEPOS
control_DATA = slepos_migration.xml
Modified: trunk/pos-installation/control/slepos_migration.xml
URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/control/slepos_migration.xml?rev=41420&r1=41419&r2=41420&view=diff
==============================================================================
--- trunk/pos-installation/control/slepos_migration.xml (original)
+++ trunk/pos-installation/control/slepos_migration.xml Mon Oct 15 13:07:57 2007
@@ -3,13 +3,13 @@
xmlns:config="http://www.suse.com/1.0/configns">
<config>
<!-- Default archive location -->
- /var/adm/backup/SLEPOS_DATA/
+ /var/lib/SLEPOS/backup/
<!-- Default archive name -->
- SLEPOS_DATA_
+ NLPOS9_DATA_
<!-- Defines whether backup is selected by default -->
- false
+ true
<!-- UI sleep in msecs -->
50
@@ -22,58 +22,35 @@
</config>
<itemcopies config:type="list">
-
<itemcopy>
+ <!-- tftpboot directory changed because of FHS -->
<type>directory</type>
- <source>/yast/test/XML</source>
- <destination>/srv/SLEPOS/1/</destination>
+ <source>/tftpboot</source>
+ <destination>/srv/tftpboot</destination>
</itemcopy>
<itemcopy>
<type>directory</type>
- <source>/yast/Botanicka</source>
- <destination>/srv/SLEPOS/15/</destination>
+ <!-- directory used by rsync service for network synchronization -->
+ <source>/opt/SLES/POS/rsync</source>
+ <destination>/srv/SLEPOS</destination>
</itemcopy>
<itemcopy>
<type>directory</type>
- <source>/yast/CODE11/SL_11.0/zypp/</source>
- <!-- Destination is always directory! -->
- <destination>/srv/SLEPOS/2/</destination>
+ <!-- all images from nlpos9 will be saved to special location, no directly in kiwi image folder though! -->
+ <source>from /opt/SLES/POS/system to </source>
+ <destination>/var/lib/SLEPOS/system/nlpos9_images</destination>
</itemcopy>
- <itemcopy>
- <type>file</type>
- <source>/yast/CODE11/Alpha6Test.xml</source>
- <!-- Destination is always directory! -->
- <destination>/srv/SLEPOS/3</destination>
- </itemcopy>
-
- <itemcopy>
+
- <itemcopy>
- <type>directory</type>
- <source>/tmp/some/missing/dir</source>
- <destination>/srv/SLEPOS/5/</destination>
- </itemcopy>
-
- <!-- Erroneous -->
- <itemcopy>
- <type>directory</type>
- <destination>/srv/SLEPOS/12/</destination>
- </itemcopy>
-
- <!-- Erroneous -->
- <itemcopy>
- <type>dyrectori</type>
- <source>/tmp/</source>
- <destination>/tmp/</destination>
- </itemcopy>
+
</itemcopies>
</migrate>
Modified: trunk/pos-installation/package/yast2-pos-installation.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/package/yast2-pos-installation.changes?rev=41420&r1=41419&r2=41420&view=diff
==============================================================================
--- trunk/pos-installation/package/yast2-pos-installation.changes (original)
+++ trunk/pos-installation/package/yast2-pos-installation.changes Mon Oct 15 13:07:57 2007
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Mon Oct 15 12:38:05 CEST 2007 - locilka@suse.cz
+
+- Changing location of migration control file to /etc/SLEPOS.
+- Adding real-data migration configuration.
+- Proposing to skip migration if nothing to migrate is available.
+- 2.13.2
+
+-------------------------------------------------------------------
Mon Oct 15 08:42:43 CEST 2007 - locilka@suse.cz
- Renamed scripts *.ycp to inst_*.ycp (#333495)
Modified: trunk/pos-installation/src/clients/inst_slepos_data_migration.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/src/clients/inst_slepos_data_migration.ycp?rev=41420&r1=41419&r2=41420&view=diff
==============================================================================
--- trunk/pos-installation/src/clients/inst_slepos_data_migration.ycp (original)
+++ trunk/pos-installation/src/clients/inst_slepos_data_migration.ycp Mon Oct 15 13:07:57 2007
@@ -1,6 +1,6 @@
{
// Configuration
- string migration_conf = "/etc/YaST2/slepos_migration.xml";
+ string migration_conf = "/etc/SLEPOS/slepos_migration.xml";
// Default values are defined in $migration_conf file
// Fallback values below
@@ -261,7 +261,7 @@
`Left (`Label (_("Note: Migration can take very long time according to the current size of your data.")))
),
// TRANSLATORS: Dialog help
- _("<p>Some help - <b>FIXME!!!!</b></p>"),
+ _("<p>Some help - <b>FIXME Text1!!!!</b></p>"),
Label::BackButton(),
Label::NextButton()
);
@@ -484,7 +484,7 @@
`VStretch ()
),
// TRANSLATORS: Dialog help
- _("<p>Some help - <b>FIXME!!!!</b></p>"),
+ _("<p>Some help - <b>FIXME Text2!!!!</b></p>"),
Label::BackButton(),
Label::NextButton()
);
@@ -492,8 +492,20 @@
Wizard::SetTitleIcon ("yast-disk");
}
+ void SetMigrationDialogInit () {
+ if (size (copy_data_dirs) > 0 || size (copy_data_files) > 0) {
+ y2milestone ("Something to be migrated");
+ UI::ChangeWidget (`id (`skip_or_do_migration), `CurrentButton, `do_migrate);
+ } else {
+ y2warning ("Nothing to migrate");
+ UI::ChangeWidget (`id (`skip_or_do_migration), `CurrentButton, `skip_migration);
+ }
+ AdjustMigrationDialog();
+ }
+
symbol InitialDialog () {
DisplayMigrationDialog();
+ SetMigrationDialogInit();
symbol init_dialog_ret = HandleMigrationDialog();
y2milestone ("InitDialog: %1", init_dialog_ret);
@@ -940,7 +952,7 @@
`Label (_("Running post-migration script..."))
),
// TRANSLATORS: Dialog help
- _("<p>Some help - <b>FIXME!!!!</b></p>"),
+ _("<p>Some help - <b>FIXME Text3!!!!</b></p>"),
Label::BackButton(),
Label::NextButton()
);
Modified: trunk/pos-installation/yast2-pos-installation.spec.in
URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/yast2-pos-installation.spec.in?rev=41420&r1=41419&r2=41420&view=diff
==============================================================================
--- trunk/pos-installation/yast2-pos-installation.spec.in (original)
+++ trunk/pos-installation/yast2-pos-installation.spec.in Mon Oct 15 13:07:57 2007
@@ -23,5 +23,5 @@
%defattr(-,root,root)
@clientdir@/*.ycp
@desktopdir@/*.desktop
-/etc/YaST2/*
+/etc/SLEPOS/*
%doc @docdir@
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
