October 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r41322 - /trunk/pos-installation/yast2-pos-installation.spec.in
by locilka＠svn.opensuse.org 10 Oct '07

10 Oct '07

Author: locilka Date: Wed Oct 10 14:40:51 2007 New Revision: 41322 URL: http://svn.opensuse.org/viewcvs/yast?rev=41322&view=rev Log: Fixed spec file Modified: trunk/pos-installation/yast2-pos-installation.spec.in Modified: trunk/pos-installation/yast2-pos-installation.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/yast2-pos-insta… ============================================================================== --- trunk/pos-installation/yast2-pos-installation.spec.in (original) +++ trunk/pos-installation/yast2-pos-installation.spec.in Wed Oct 10 14:40:51 2007 @@ -6,10 +6,10 @@ BuildArchitectures: noarch -Summary: Configuration of pos-installation +Summary: POS Installation and Upgrade %description -- +YaST POS Installation - controls the pos installation and upgrade @PREP@ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41321 - in /trunk/pos-installation: ./ config/ control/ doc/autodocs/ src/clients/ src/scripts/
by locilka＠svn.opensuse.org 10 Oct '07

10 Oct '07

Author: locilka Date: Wed Oct 10 14:38:47 2007 New Revision: 41321 URL: http://svn.opensuse.org/viewcvs/yast?rev=41321&view=rev Log: Added Desktop file Fixed some Makefiles Fixed spec file Added: trunk/pos-installation/config/ trunk/pos-installation/config/Makefile.am trunk/pos-installation/config/pos_migration_assistent.desktop Modified: trunk/pos-installation/control/Makefile.am trunk/pos-installation/doc/autodocs/Makefile.am trunk/pos-installation/src/clients/Makefile.am trunk/pos-installation/src/scripts/Makefile.am trunk/pos-installation/yast2-pos-installation.spec.in Added: trunk/pos-installation/config/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/config/Makefile… ============================================================================== --- trunk/pos-installation/config/Makefile.am (added) +++ trunk/pos-installation/config/Makefile.am Wed Oct 10 14:38:47 2007 @@ -0,0 +1,7 @@ +# Makefile.am for installation/vendor + +desktop_DATA = pos_migration_assistent.desktop + +EXTRA_DIST = $(desktop_DATA) + +include $(top_srcdir)/Makefile.am.common Added: trunk/pos-installation/config/pos_migration_assistent.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/config/pos_migr… ============================================================================== --- trunk/pos-installation/config/pos_migration_assistent.desktop (added) +++ trunk/pos-installation/config/pos_migration_assistent.desktop Wed Oct 10 14:38:47 2007 @@ -0,0 +1,13 @@ +[Desktop Entry] +Type=Application +Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Misc; + +X-SuSE-YaST-Call=slepos_data_migration +X-SuSE-YaST-RootOnly=yes +X-SuSE-YaST-Group=Misc + +Icon=yast-disk +Exec=/sbin/yast2 slepos_data_migration + +Name=POS Migration Assistent +GenericName=Migrate your old POS data to a new location Modified: trunk/pos-installation/control/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/control/Makefil… ============================================================================== --- trunk/pos-installation/control/Makefile.am (original) +++ trunk/pos-installation/control/Makefile.am Wed Oct 10 14:38:47 2007 @@ -1,8 +1,8 @@ # Makefile.am for installation/general # -SUBDIRS = docs tests +SUBDIRS = -controldir = $(yast2dir)/control +controldir = /etc/YaST2 control_DATA = slepos_migration.xml Modified: trunk/pos-installation/doc/autodocs/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/doc/autodocs/Ma… ============================================================================== --- trunk/pos-installation/doc/autodocs/Makefile.am (original) +++ trunk/pos-installation/doc/autodocs/Makefile.am Wed Oct 10 14:38:47 2007 @@ -1,3 +1,3 @@ # Makefile.am for pos-installation/doc/autodocs -include $(top_srcdir)/autodocs-ycp.ami +# include $(top_srcdir)/autodocs-ycp.ami Modified: trunk/pos-installation/src/clients/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/src/clients/Mak… ============================================================================== --- trunk/pos-installation/src/clients/Makefile.am (original) +++ trunk/pos-installation/src/clients/Makefile.am Wed Oct 10 14:38:47 2007 @@ -1,11 +1,5 @@ # Makefile.am for installation/general client_DATA = $(wildcard *.ycp) -YCPCFLAGS = -M ../modules - -EXTRA_DIST = $(client_DATA) - -install-data-local: - -install -d -m 755 $(DESTDIR)/var/lib/YaST2 include $(top_srcdir)/Makefile.am.common Modified: trunk/pos-installation/src/scripts/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/src/scripts/Mak… ============================================================================== --- trunk/pos-installation/src/scripts/Makefile.am (original) +++ trunk/pos-installation/src/scripts/Makefile.am Wed Oct 10 14:38:47 2007 @@ -1,6 +1,6 @@ # Makefile.am for installation/general -client_DATA = $(wildcard *.*) +client_DATA = $(wildcard *.pl *.sh) install-data-local: -install -d -m 755 $(DESTDIR)/var/lib/YaST2 Modified: trunk/pos-installation/yast2-pos-installation.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/yast2-pos-insta… ============================================================================== --- trunk/pos-installation/yast2-pos-installation.spec.in (original) +++ trunk/pos-installation/yast2-pos-installation.spec.in Wed Oct 10 14:38:47 2007 @@ -21,11 +21,6 @@ %files %defattr(-,root,root) -%dir @yncludedir@/pos-installation -@yncludedir@/pos-installation/* -@clientdir@/pos-installation.ycp -@clientdir@/pos-installation_*.ycp -@moduledir@/PosInstallation.* -@moduledir@/PosInstallation2.* +@clientdir@/*.ycp @desktopdir@/pos-installation.desktop %doc @docdir@ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41319 - /tags/branch-Linux-10_3-2_15_9/product-creator/
by jsuchome＠svn.opensuse.org 10 Oct '07

10 Oct '07

Author: jsuchome Date: Wed Oct 10 14:34:15 2007 New Revision: 41319 URL: http://svn.opensuse.org/viewcvs/yast?rev=41319&view=rev Log: Created tag branch-Linux-10_3-2_15_9 for product-creator Added: tags/branch-Linux-10_3-2_15_9/product-creator/ - copied from r41318, branches/SuSE-Linux-10_3-Branch/product-creator/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41320 - in /trunk/devtools: VERSION devtools/admin/Makefile.am.toplevel devtools/bin/y2autoconf package/yast2-devtools.changes
by mvidner＠svn.opensuse.org 10 Oct '07

10 Oct '07

Author: mvidner Date: Wed Oct 10 14:34:16 2007 New Revision: 41320 URL: http://svn.opensuse.org/viewcvs/yast?rev=41320&view=rev Log: Suppresed portability warnings from automake. We know that we use GNU Make extensions. Modified: trunk/devtools/VERSION trunk/devtools/devtools/admin/Makefile.am.toplevel trunk/devtools/devtools/bin/y2autoconf trunk/devtools/package/yast2-devtools.changes Modified: trunk/devtools/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/VERSION?rev=41320&r1=41… ============================================================================== --- trunk/devtools/VERSION (original) +++ trunk/devtools/VERSION Wed Oct 10 14:34:16 2007 @@ -1 +1 @@ -2.16.0 +2.16.1 Modified: trunk/devtools/devtools/admin/Makefile.am.toplevel URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/admin/Makefile… ============================================================================== --- trunk/devtools/devtools/admin/Makefile.am.toplevel (original) +++ trunk/devtools/devtools/admin/Makefile.am.toplevel Wed Oct 10 14:34:16 2007 @@ -30,6 +30,7 @@ extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) +# less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools instal m4 snippets # argh, executed literally Modified: trunk/devtools/devtools/bin/y2autoconf URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/bin/y2autoconf… ============================================================================== --- trunk/devtools/devtools/bin/y2autoconf (original) +++ trunk/devtools/devtools/bin/y2autoconf Wed Oct 10 14:34:16 2007 @@ -101,7 +101,8 @@ AC_PREFIX_DEFAULT(/usr) -AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs +dnl long filenames; we use GNU Make extensions and that's ok +AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables VERSION=\"$VERSION\" Modified: trunk/devtools/package/yast2-devtools.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/package/yast2-devtools.… ============================================================================== --- trunk/devtools/package/yast2-devtools.changes (original) +++ trunk/devtools/package/yast2-devtools.changes Wed Oct 10 14:34:16 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Oct 10 14:34:01 CEST 2007 - mvidner(a)suse.cz + +- Suppresed portability warnings from automake. We know that we use + GNU Make extensions. +- 2.16.1 + +------------------------------------------------------------------- Tue Oct 2 10:23:44 CEST 2007 - mvidner(a)suse.cz - One copy of the license is enough (COPYING), removed -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41318 - /tags/branch-Linux-10_3-2_15_9/
by jsuchome＠svn.opensuse.org 10 Oct '07

10 Oct '07

Author: jsuchome Date: Wed Oct 10 14:34:10 2007 New Revision: 41318 URL: http://svn.opensuse.org/viewcvs/yast?rev=41318&view=rev Log: Created tag branch-Linux-10_3-2_15_9 Added: tags/branch-Linux-10_3-2_15_9/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41317 - in /branches/SuSE-Linux-10_3-Branch/product-creator: ./ agent-kiwi/ package/ src/ src/data/kiwi_templates/iso/ src/data/kiwi_templates/iso/root/etc/ src/data/kiwi_templates/iso/root/etc/in...
by jsuchome＠svn.opensuse.org 10 Oct '07

10 Oct '07

Author: jsuchome Date: Wed Oct 10 14:33:52 2007 New Revision: 41317 URL: http://svn.opensuse.org/viewcvs/yast?rev=41317&view=rev Log: - add a default user to the iso template (#328145) - new template based on current kiwi-desc-livesystem (#328003) - do not allow configuration without name (#328003) - 2.15.9 Added: branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/iso/root/etc/init.d/create_xconf (with props) Removed: branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/iso/root/etc/group branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/iso/root/etc/init.d/boot branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/iso/root/etc/inittab branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/iso/root/etc/passwd branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/iso/root/etc/shadow branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/iso/root/etc/sysconfig/console branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/iso/root/etc/sysconfig/keyboard branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/iso/root/etc/sysconfig/network/config branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/iso/root/etc/sysconfig/network/dhcp branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/iso/root/etc/sysconfig/network/ifcfg-lo branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/iso/root/etc/sysconfig/network/ifroute-lo branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/iso/root/etc/sysconfig/network/routes branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/iso/root/etc/sysconfig/windowmanager branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/xen/root/etc/passwd branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/xen/root/etc/shadow branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/xen/root/etc/sysconfig/network/dhcp branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/xen/root/etc/sysconfig/network/ifcfg-lo branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/xen/root/etc/sysconfig/network/ifroute-lo Modified: branches/SuSE-Linux-10_3-Branch/product-creator/VERSION branches/SuSE-Linux-10_3-Branch/product-creator/agent-kiwi/ag_kiwi branches/SuSE-Linux-10_3-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-Linux-10_3-Branch/product-creator/src/Kiwi.ycp branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/iso/config.sh branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/iso/config.xml branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/iso/root/etc/Makefile.am branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/iso/root/etc/init.d/Makefile.am branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/iso/root/etc/sysconfig/Makefile.am branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/iso/root/etc/sysconfig/network/Makefile.am branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/xen/config.xml branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/xen/root/etc/Makefile.am branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/xen/root/etc/sysconfig/network/Makefile.am branches/SuSE-Linux-10_3-Branch/product-creator/src/kiwi_dialogs.ycp Modified: branches/SuSE-Linux-10_3-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/produc… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/product-creator/VERSION (original) +++ branches/SuSE-Linux-10_3-Branch/product-creator/VERSION Wed Oct 10 14:33:52 2007 @@ -1 +1 @@ -2.15.8 +2.15.9 Modified: branches/SuSE-Linux-10_3-Branch/product-creator/agent-kiwi/ag_kiwi URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/produc… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/product-creator/agent-kiwi/ag_kiwi (original) +++ branches/SuSE-Linux-10_3-Branch/product-creator/agent-kiwi/ag_kiwi Wed Oct 10 14:33:52 2007 @@ -36,7 +36,7 @@ for (my $i=1;$i<= $packageNodeList->size();$i++) { my $node = $packageNodeList -> get_node($i); my $type = $node -> getAttribute ("type"); - y2milestone ("package list type: $type"); + y2debug ("package list type: $type"); $retmap{$key}{$type} = {}; my $patterntype = $node -> getAttribute ("patternType"); $retmap{$key}{$type}{"patternType"} = $patterntype if $patterntype; @@ -60,9 +60,10 @@ } my $prefs = $optionsNodeList -> get_node(1); foreach my $tag ("packagemanager", "version", "rpm-check-signatures", - "rpm-force", "size", "defaultdestination") { + "rpm-force", "size", "defaultdestination", "defaultroot", "locale") + { my $element = $prefs -> getElementsByTagName ($tag); - $retmap{$tag} = $element-> get_node(1)->textContent () if ($element); + $retmap{$tag} = $element->get_node(1)->textContent () if ($element); } # now get the 'type' attributes # example: <type primary="true" boot="isoboot/suse-10.3" flags="compressed">iso</type> @@ -96,11 +97,17 @@ my $image = $systemTree -> getElementsByTagName ("image")->get_node (1); my $image_name = $image -> getAttribute ("name"); - $retmap{"name"} = $image_name if $image_name; + if ($image_name) { + $retmap{"name"} = $image_name; + y2milestone ("image name: $image_name"); + } my $scheme_ver = $image -> getAttribute ("schemeversion"); $retmap{"schemeversion"} = $scheme_ver if $scheme_ver; + my $inherit = $image -> getAttribute ("inherit"); + $retmap{"inherit"} = $inherit if $inherit; + $retmap{"users"} = {}; foreach my $usernode ($usrdataNodeList -> get_nodelist()) { my $group = $usernode -> getAttribute("group"); @@ -123,7 +130,7 @@ for (my $i=1;$i<= $driversNodeList->size();$i++) { my $node = $driversNodeList -> get_node($i); my $type = $node -> getAttribute ("type"); - y2milestone ("driver list type: $type"); + y2debug ("driver list type: $type"); $retmap{$key}{$type} = {}; foreach my $tag ("file") { my @list = (); Modified: branches/SuSE-Linux-10_3-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/produc… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-Linux-10_3-Branch/product-creator/package/yast2-product-creator.changes Wed Oct 10 14:33:52 2007 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Oct 4 09:50:06 CEST 2007 - jsuchome(a)suse.cz + +- add a default user to the iso template (#328145) +- new template based on current kiwi-desc-livesystem (#328003) +- do not allow configuration without name (#328003) +- 2.15.9 + +------------------------------------------------------------------- Mon Sep 24 08:44:56 CEST 2007 - jsuchome(a)suse.cz - do not close module after kiwi failure (#327593) Modified: branches/SuSE-Linux-10_3-Branch/product-creator/src/Kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/produc… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/product-creator/src/Kiwi.ycp (original) +++ branches/SuSE-Linux-10_3-Branch/product-creator/src/Kiwi.ycp Wed Oct 10 14:33:52 2007 @@ -69,7 +69,7 @@ /** * generate the 'repository' tag */ - map get_source_value (string source) { + map get_source_value (string source, map config) { string type = "yast2"; string source_path = adapt_source_path (source); @@ -86,7 +86,7 @@ type = "rpm-md"; } }); - return $[ + map ret = $[ "__key" : "repository", "type" : type, "__children": [ @@ -96,6 +96,7 @@ ] ] ]; + return ret; // FIXME add status? } /** @@ -118,10 +119,11 @@ "__value" : task, "primary" : "true", "boot" : boot_image, -//FIXME (KiwiConfig["compressed"]:false ? ",compressed" : ""), ]; if (task != "iso") - ret["filesystem"] = "ext3"; + ret["filesystem"] = config["type",task,"filesystem"]:"ext3"; + if (config["type",task,"flags"]:"" != "") + ret["flags"] = config["type",task,"flags"]:""; return ret; } @@ -400,7 +402,7 @@ } write_list[0,"__children"] = union (write_list[0,"__children"]:[], maplist (string source, (list<string>) KiwiConfig["sources"]:[], - ``(get_source_value (source)) + ``(get_source_value (source, KiwiConfig)) ) ); write_list[0,"__children"] = union (write_list[0,"__children"]:[], [ @@ -451,6 +453,10 @@ SCR::Execute (.target.bash, "chmod +x " + config_dir + "/" + file); } }); + foreach (string file, KiwiConfig["import_files"]:[], { + y2milestone ("copying %1 to %2", file,config_dir); + SCR::Execute (.target.bash, sformat ("cp -ar %1 %2/", file,config_dir)); + }); return true; } @@ -514,17 +520,26 @@ symbol ret = nil; boolean creating = false; + boolean first_lines = false; + integer lines_show = 0; + integer times_read = 0; do { ret = (symbol) UI::PollInput(); if ((boolean) SCR::Read(.background.output_open) && - (integer) SCR::Read(.background.newlines)>0) + (integer) SCR::Read(.background.newlines) > lines_show) { + if (times_read > 10) + lines_show = 20; + else + times_read = times_read + 1; update_output (); } else if (!(boolean)SCR::Read(.background.isrunning)) { update_output (); + lines_show = 0; + times_read = 0; integer status = (integer) SCR::Read (.background.status); if (status != 0) Modified: branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/iso/config.sh URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/produc… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/iso/config.sh (original) +++ branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/iso/config.sh Wed Oct 10 14:33:52 2007 @@ -22,6 +22,18 @@ test -f /.profile && . /.profile #====================================== +# Sound? +#-------------------------------------- + +# Load sound drivers by default +perl -ni -e 'm,^blacklist snd-, || print;' \ + /etc/modprobe.d/blacklist + +# and unmute their mixers. +perl -pi -e 's,/sbin/alsactl -F restore,/bin/set_default_volume -f,;' \ + /etc/udev/rules.d/40-alsa.rules + +#====================================== # Greeting... #-------------------------------------- echo "Configure image: [$name]..." @@ -30,10 +42,71 @@ # Activate services #-------------------------------------- suseActivateServices + +#====================================== +# Deactivate services +#-------------------------------------- suseRemoveService boot.multipath suseRemoveService boot.device-mapper suseRemoveService mdadmd suseRemoveService multipathd +suseRemoveService rpmconfigcheck +suseRemoveService waitfornm +suseRemoveService smb +suseRemoveService xfs +suseRemoveService nmb +suseRemoveService autofs +suseRemoveService rpasswdd +suseRemoveService boot.scsidev +suseRemoveService boot.md +suseInsertService create_xconf +suseService boot.rootfsck off +# these two we want to disable for policy reasons +chkconfig sshd off +chkconfig cron off + +# these are disabled because kiwi enables them without being default +chkconfig aaeventd off +chkconfig autoyast off +chkconfig boot.sched off +chkconfig create_xconf off +chkconfig dvb off +chkconfig esound off +chkconfig fam off +chkconfig festival off +chkconfig hotkey-setup off +chkconfig ipxmount off +chkconfig irda off +chkconfig java.binfmt_misc off +chkconfig joystick off +chkconfig lirc off +chkconfig lm_sensors off +chkconfig nfs off +chkconfig ntp off +chkconfig openct off +chkconfig pcscd off +chkconfig powerd off +chkconfig raw off +chkconfig saslauthd off +chkconfig spamd off +chkconfig xinetd off +chkconfig ypbind off + +cd / +patch -p0 < /tmp/config.patch +rm /tmp/config.patch + +insserv + +rpm -e smart +rpm -e rpm-python +rpm -e python + +: > /var/log/zypper.log +rm -rf /var/cache/zypp/raw/* + +zypper addrepo http://download.opensuse.org/distribution/10.3/repo/oss/ 10.3 +zypper addrepo http://download.opensuse.org/update/10.3/ 10.3-update #====================================== # SuSEconfig Modified: branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/iso/config.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/produc… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/iso/config.xml (original) +++ branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/iso/config.xml Wed Oct 10 14:33:52 2007 @@ -10,41 +10,17 @@ <rpm-check-signatures>False</rpm-check-signatures> <rpm-force>True</rpm-force> </preferences> + <users group="users"> + <user home="/home/linux" name="linux"/> + <user home="/root" name="root"/> + </users> <packages type="image" patternType="plusRecommended"> <package name="xkeyboard-config"/> + <package name="sax2"/> <opensusePattern name="default"/> <opensusePattern name="base"/> <opensusePattern name="x11"/> - <ignore name="smtp_daemon"/> - <ignore name="pfscalibratio"/> - <ignore name="jaf-demo"/> - <ignore name="jaf-javadoc"/> - <ignore name="jaf-manual"/> - <ignore name="jai"/> - <ignore name="java-1_4_2-sun"/> - <ignore name="java-1_4_2-sun-alsa"/> - <ignore name="java-1_4_2-sun-devel"/> - <ignore name="java-1_4_2-sun-jdbc"/> - <ignore name="java-1_4_2-sun-plugin"/> - <ignore name="javamail-manual"/> - <ignore name="jmx-javadoc"/> - <ignore name="jta-javadoc"/> - <ignore name="mcelog"/> - <ignore name="numactl"/> - <ignore name="wesnoth-data-small"/> - <ignore name="sendmail"/> - <ignore name="exim"/> - <ignore name="AdobeICCProfiles"/> - <ignore name="RealPlayer"/> - <ignore name="agfa-fonts"/> - <ignore name="flash-player"/> - <ignore name="java-1_5_0-sun"/> - <ignore name="java-1_5_0-sun-plugin"/> - <ignore name="java-1_5_0-sun-jdbc"/> - <ignore name="java-1_5_0-sun-devel"/> - <ignore name="java-1_5_0-sun-alsa"/> - <ignore name="opensuse-quickstart_en"/> - <ignore name="util-linux-crypto"/> + <opensusePattern name="kde"/> </packages> <packages type="xen" memory="512" disk="/dev/sda"> <package name="kernel-xen"/> Modified: branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/iso/root/etc/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/produc… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/iso/root/etc/Makefile.am (original) +++ branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/iso/root/etc/Makefile.am Wed Oct 10 14:33:52 2007 @@ -5,11 +5,4 @@ ydatadir = @ydatadir@/product-creator/kiwi_templates/iso/root/etc -ydata_DATA = \ - group \ - passwd \ - shadow \ - inittab - - -EXTRA_DIST = $(ydata_DATA) +#EXTRA_DIST = $(ydata_DATA) Modified: branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/iso/root/etc/init.d/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/produc… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/iso/root/etc/init.d/Makefile.am (original) +++ branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/iso/root/etc/init.d/Makefile.am Wed Oct 10 14:33:52 2007 @@ -4,6 +4,6 @@ ydatadir = @ydatadir@/product-creator/kiwi_templates/iso/root/etc/init.d ydata_SCRIPTS = \ - boot + create_xconf EXTRA_DIST = $(ydata_SCRIPTS) Added: branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/iso/root/etc/init.d/create_xconf URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/produc… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/iso/root/etc/init.d/create_xconf (added) +++ branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/iso/root/etc/init.d/create_xconf Wed Oct 10 14:33:52 2007 @@ -0,0 +1,68 @@ +#! /bin/sh +# Copyright (c) 1995-2003 SuSE Linux AG, Nuernberg, Germany. +# All rights reserved. +# +### BEGIN INIT INFO +# Provides: create_xconf +# Required-Start: $local_fs +# Required-Stop: +# Default-Start: 5 +# Default-Stop: +# X-Start-Before: earlyxdm +# Description: Call sax +### END INIT INFO + +# First reset status of this service +. /etc/rc.status +rc_reset + +# Return values acc. to LSB for all commands but status: +# 0 - success +# 1 - generic or unspecified error +# 2 - invalid or excess argument(s) +# 3 - unimplemented feature (e.g. "reload") +# 4 - insufficient privilege +# 5 - program is not installed +# 6 - program is not configured +# 7 - program is not running + +case "$1" in + start) + echo -n "Creating X Config" + # create config file if not yet done + if [ ! -f /etc/X11/xorg.conf ];then + /usr/sbin/sax2 -c 0 -a -i &>/dev/null + fi + rc_status -v + ;; + stop) + ;; + try-restart) + rc_status + ;; + restart) + rc_status + ;; + try-restart-iburst) + rc_status + ;; + force-reload) + # Does not support signalling to reload + $0 try-restart + rc_status + ;; + reload) + rc_status -v + ;; + status) + rc_status -v + ;; + probe) + rc_failed 3 + ;; + *) + echo "Usage: $0 {start|stop|status|try-restart|restart|try-restart-iburst|force-reload|reload|probe|ntptimeset}" + exit 1 + ;; +esac +rc_exit Modified: branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/iso/root/etc/sysconfig/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/produc… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/iso/root/etc/sysconfig/Makefile.am (original) +++ branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/iso/root/etc/sysconfig/Makefile.am Wed Oct 10 14:33:52 2007 @@ -6,9 +6,6 @@ ydatadir = @ydatadir@/product-creator/kiwi_templates/iso/root/etc/sysconfig ydata_DATA = \ - console \ - displaymanager \ - keyboard \ - windowmanager + displaymanager EXTRA_DIST = $(ydata_DATA) Modified: branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/iso/root/etc/sysconfig/network/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/produc… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/iso/root/etc/sysconfig/network/Makefile.am (original) +++ branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/iso/root/etc/sysconfig/network/Makefile.am Wed Oct 10 14:33:52 2007 @@ -5,12 +5,7 @@ ydatadir = @ydatadir@/product-creator/kiwi_templates/iso/root/etc/sysconfig/network ydata_DATA = \ - config \ - dhcp \ - ifcfg-eth0 \ - ifcfg-lo \ - ifroute-lo \ - routes + ifcfg-eth0 EXTRA_DIST = $(ydata_DATA) Modified: branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/xen/config.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/produc… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/xen/config.xml (original) +++ branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/xen/config.xml Wed Oct 10 14:33:52 2007 @@ -10,6 +10,10 @@ <rpm-check-signatures>False</rpm-check-signatures> <rpm-force>True</rpm-force> </preferences> + <users group="users"> + <user home="/home/linux" name="linux"/> + <user home="/root" name="root"/> + </users> <packages type="image"> <package name="OpenIPMI"/> <package name="lvm2"/> Modified: branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/xen/root/etc/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/produc… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/xen/root/etc/Makefile.am (original) +++ branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/xen/root/etc/Makefile.am Wed Oct 10 14:33:52 2007 @@ -5,8 +5,4 @@ ydatadir = @ydatadir@/product-creator/kiwi_templates/xen/root/etc -ydata_DATA = \ - passwd \ - shadow - EXTRA_DIST = $(ydata_DATA) Modified: branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/xen/root/etc/sysconfig/network/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/produc… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/xen/root/etc/sysconfig/network/Makefile.am (original) +++ branches/SuSE-Linux-10_3-Branch/product-creator/src/data/kiwi_templates/xen/root/etc/sysconfig/network/Makefile.am Wed Oct 10 14:33:52 2007 @@ -5,9 +5,6 @@ ydatadir = @ydatadir@/product-creator/kiwi_templates/xen/root/etc/sysconfig/network ydata_DATA = \ - dhcp \ - ifcfg-eth0 \ - ifcfg-lo \ - ifroute-lo + ifcfg-eth0 EXTRA_DIST = $(ydata_DATA) Modified: branches/SuSE-Linux-10_3-Branch/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/produc… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/product-creator/src/kiwi_dialogs.ycp (original) +++ branches/SuSE-Linux-10_3-Branch/product-creator/src/kiwi_dialogs.ycp Wed Oct 10 14:33:52 2007 @@ -759,6 +759,19 @@ KiwiConfig[file] = contents; } }); + // take care of the rest in the input directory (#330052) + list import_files = []; + map out = (map) SCR::Execute (.target.bash_output, + sformat ("ls -A1 -d %1/* 2>/dev/null", kiwi_configuration)); + foreach (string line, splitstring (out["stdout"]:"", "\n"), { + if (line == "") return; + string last = substring (line, findlastof (line, "/") + 1); + if (contains (["images.sh", "config.sh", "config.xml", "root","config"], + last)) + return; + import_files = add (import_files, line); + }); + KiwiConfig["import_files"] = import_files; map<string,any> read_config = Kiwi::ReadConfigXML (kiwi_configuration); if (!KiwiConfig["_imported"]:false) @@ -1411,6 +1424,8 @@ kiwi_configuration = dir; Config = eval (Kiwi::ReadConfigXML (kiwi_configuration)); name = Config["name"]:""; + if (Config["iso-directory"]:"" != "") + UI::ChangeWidget (`id (`out_dir),`Value,Config["iso-directory"]:""); repositories = $[]; foreach (map repo, (list<map>) Config["repository"]:[], { string source = repo["source",0,"path"]:""; @@ -1618,6 +1633,14 @@ } else if (ret == `next) { + name = (string) UI::QueryWidget (`id (`config), `Value); + if (name == "") + { + // error popup + Report::Error(_("Enter the name of the configuration.")); + UI::SetFocus (`id (`config)); + continue; + } out_dir = (string) UI::QueryWidget (`id (`out_dir), `Value); if (out_dir == "") { @@ -1637,6 +1660,7 @@ } if (ret == `next) { + Config["name"] = name; Config["kiwi_configuration_" + kiwi_task] = kiwi_configuration; Config["_imported"] = true; Config["iso-directory"] = out_dir; @@ -1650,8 +1674,6 @@ Pkg::SourceRestore (); Pkg::SourceLoad(); } - if (Config["name"]:"" == "") - Config["name"] = UI::QueryWidget (`id (`config), `Value); ProductCreator::Config = Config; ProductCreator::kiwi_task = kiwi_task; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41316 - in /trunk/pos-installation: ./ agents/ control/ doc/ doc/autodocs/ package/ src/ src/clients/ src/scripts/ testsuite/ testsuite/tests/
by locilka＠svn.opensuse.org 10 Oct '07

10 Oct '07

Author: locilka Date: Wed Oct 10 14:08:04 2007 New Revision: 41316 URL: http://svn.opensuse.org/viewcvs/yast?rev=41316&view=rev Log: - initial version of POS-Installation module * POS Data Migration client * POS Pattern Selector - 2.13.0 Added: trunk/pos-installation/ trunk/pos-installation/.cvsignore trunk/pos-installation/MAINTAINER trunk/pos-installation/Makefile.cvs trunk/pos-installation/RPMNAME trunk/pos-installation/VERSION trunk/pos-installation/agents/ trunk/pos-installation/agents/.cvsignore trunk/pos-installation/agents/Makefile.am trunk/pos-installation/configure.in.in trunk/pos-installation/control/ trunk/pos-installation/control/Makefile.am trunk/pos-installation/control/README.txt trunk/pos-installation/control/installation.xml trunk/pos-installation/control/slepos_migration.xml trunk/pos-installation/doc/ trunk/pos-installation/doc/.cvsignore trunk/pos-installation/doc/Makefile.am trunk/pos-installation/doc/autodocs/ trunk/pos-installation/doc/autodocs/.cvsignore trunk/pos-installation/doc/autodocs/Makefile.am trunk/pos-installation/package/ trunk/pos-installation/package/.cvsignore trunk/pos-installation/package/yast2-pos-installation.changes trunk/pos-installation/src/ trunk/pos-installation/src/.cvsignore trunk/pos-installation/src/Makefile.am trunk/pos-installation/src/clients/ trunk/pos-installation/src/clients/Makefile.am trunk/pos-installation/src/clients/slepos_data_migration.ycp trunk/pos-installation/src/clients/slepos_server_selection.ycp trunk/pos-installation/src/scripts/ trunk/pos-installation/src/scripts/Makefile.am trunk/pos-installation/src/scripts/slepos_post.pl (with props) trunk/pos-installation/testsuite/ trunk/pos-installation/testsuite/.cvsignore trunk/pos-installation/testsuite/Makefile.am trunk/pos-installation/testsuite/tests/ trunk/pos-installation/testsuite/tests/.cvsignore trunk/pos-installation/yast2-pos-installation.spec.in Added: trunk/pos-installation/.cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/.cvsignore?rev=… ============================================================================== --- trunk/pos-installation/.cvsignore (added) +++ trunk/pos-installation/.cvsignore Wed Oct 10 14:08:04 2007 @@ -0,0 +1,20 @@ +Makefile +Makefile.am +Makefile.am.common +Makefile.in +aclocal.m4 +config.cache +config.guess +config.h.in +config.log +config.status +config.sub +configure +configure.in +depcomp +install-sh +missing +mkinstalldirs +stamp-h +pos-installation.pot +autom4te.cache Added: trunk/pos-installation/MAINTAINER URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/MAINTAINER?rev=… ============================================================================== --- trunk/pos-installation/MAINTAINER (added) +++ trunk/pos-installation/MAINTAINER Wed Oct 10 14:08:04 2007 @@ -0,0 +1 @@ +Lukas Ocilka <locilka(a)suse.cz> Added: trunk/pos-installation/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/Makefile.cvs?re… ============================================================================== --- trunk/pos-installation/Makefile.cvs (added) +++ trunk/pos-installation/Makefile.cvs Wed Oct 10 14:08:04 2007 @@ -0,0 +1,22 @@ +# +# Makefile.cvs +# +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + +configure: all + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) + +all: + y2tool y2autoconf + y2tool y2automake + autoreconf --force --install + +install: configure + make + make install + +reconf: all + ./config.status --recheck + ./config.status Added: trunk/pos-installation/RPMNAME URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/RPMNAME?rev=413… ============================================================================== --- trunk/pos-installation/RPMNAME (added) +++ trunk/pos-installation/RPMNAME Wed Oct 10 14:08:04 2007 @@ -0,0 +1 @@ +yast2-pos-installation Added: trunk/pos-installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/VERSION?rev=413… ============================================================================== --- trunk/pos-installation/VERSION (added) +++ trunk/pos-installation/VERSION Wed Oct 10 14:08:04 2007 @@ -0,0 +1 @@ +2.13.0 Added: trunk/pos-installation/agents/.cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/agents/.cvsigno… ============================================================================== --- trunk/pos-installation/agents/.cvsignore (added) +++ trunk/pos-installation/agents/.cvsignore Wed Oct 10 14:08:04 2007 @@ -0,0 +1,2 @@ +Makefile +Makefile.in Added: trunk/pos-installation/agents/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/agents/Makefile… ============================================================================== --- trunk/pos-installation/agents/Makefile.am (added) +++ trunk/pos-installation/agents/Makefile.am Wed Oct 10 14:08:04 2007 @@ -0,0 +1,7 @@ +# Makefile.am for pos-installation/agents + +agent_SCRIPTS = + +scrconf_DATA = + +EXTRA_DIST = $(agent_SCRIPTS) $(scrconf_DATA) Added: trunk/pos-installation/configure.in.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/configure.in.in… ============================================================================== --- trunk/pos-installation/configure.in.in (added) +++ trunk/pos-installation/configure.in.in Wed Oct 10 14:08:04 2007 @@ -0,0 +1,12 @@ +## YCP module configure.in.in + +## Initialize +@YAST2-INIT-COMMON@ +@YAST2-INIT-YCP@ + +## some common checks +@YAST2-CHECKS-COMMON@ +@YAST2-CHECKS-YCP@ + +## and generate the output... +@YAST2-OUTPUT@ Added: trunk/pos-installation/control/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/control/Makefil… ============================================================================== --- trunk/pos-installation/control/Makefile.am (added) +++ trunk/pos-installation/control/Makefile.am Wed Oct 10 14:08:04 2007 @@ -0,0 +1,12 @@ +# Makefile.am for installation/general +# +SUBDIRS = docs tests + +controldir = $(yast2dir)/control + +control_DATA = slepos_migration.xml + +EXTRA_DIST = $(control_DATA) $(product_DATA) + +include $(top_srcdir)/Makefile.am.common + Added: trunk/pos-installation/control/README.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/control/README.… ============================================================================== --- trunk/pos-installation/control/README.txt (added) +++ trunk/pos-installation/control/README.txt Wed Oct 10 14:08:04 2007 @@ -0,0 +1,8 @@ +Here you can find description of files: + +installation.xml + - Additional workflow modifications + +slepos_migration.xml + - Configuration for POS Migration Assisten (FATE #302870) + Added: trunk/pos-installation/control/installation.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/control/install… ============================================================================== --- trunk/pos-installation/control/installation.xml (added) +++ trunk/pos-installation/control/installation.xml Wed Oct 10 14:08:04 2007 @@ -0,0 +1,67 @@ +<?xml version="1.0"?> +<!DOCTYPE productDefines SYSTEM "/usr/share/YaST2/control/control.dtd"> +<productDefines xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> + <textdomain>control-SLEPOS</textdomain> + + <workflows config:type="list"> + + <workflow> + <defaults> + <enable_back>no</enable_back> + <enable_next>no</enable_next> + </defaults> + + <stage>normal</stage> + <mode>installation,normal</mode> + + <modules config:type="list"> + <module> + <label>Server Type Selection</label> + <name>slepos_server_selection</name> + <enable_back>no</enable_back> + <enable_next>yes</enable_next> + </module> + <module> + <label>Install Software</label> + <name>inst_rpmcopy</name> + <enable_back>yes</enable_back> + <enable_next>yes</enable_next> + </module> + <module> + <label>Data Migration</label> + <name>slepos_data_migration</name> + <enable_back>yes</enable_back> + <enable_next>yes</enable_next> + </module> + </modules> + </workflow> + </workflows> + + <update> + <workflows config:type="list"> + <workflow> + <defaults> + <enable_back>yes</enable_back> + <enable_next>yes</enable_next> + </defaults> + +  + <stage>continue</stage> + <mode>update</mode> + +  + <insert_modules config:type="list"> + <insert_module> + <before>congratulate</before> + <modules config:type="list"> + <module> + <label>Data Migration</label> + <name>slepos_data_migration</name> + </module> + </modules> + </insert_module> + </insert_modules> + </workflow> + </workflows> + </update> +</productDefines> Added: trunk/pos-installation/control/slepos_migration.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/control/slepos_… ============================================================================== --- trunk/pos-installation/control/slepos_migration.xml (added) +++ trunk/pos-installation/control/slepos_migration.xml Wed Oct 10 14:08:04 2007 @@ -0,0 +1,79 @@ +<?xml version="1.0"?> +<migrate xmlns="http://www.suse.com/1.0/yast2ns" + xmlns:config="http://www.suse.com/1.0/configns"> + <config> +  + <default_backupdir>/var/adm/backup/SLEPOS_DATA/</default_backupdir> + +  + <default_backupname>SLEPOS_DATA_</default_backupname> + +  + <default_do_backup config:type="boolean">false</default_do_backup> + +  + <migration_redraw_sleep config:type="integer">50</migration_redraw_sleep> + +  + <migration_type>copy</migration_type> + +  + <slepos_migration_post_script>/var/lib/YaST2/slepos_post.pl</slepos_migration_post_script> + </config> + + <itemcopies config:type="list"> + + <itemcopy> + <type>directory</type> + <source>/yast/test/XML</source> + <destination>/srv/SLEPOS/1/</destination> + </itemcopy> + + <itemcopy> + <type>directory</type> + <source>/yast/Botanicka</source> + <destination>/srv/SLEPOS/15/</destination> + </itemcopy> + + <itemcopy> + <type>directory</type> + <source>/yast/CODE11/SL_11.0/zypp/</source> +  + <destination>/srv/SLEPOS/2/</destination> + </itemcopy> + + <itemcopy> + <type>file</type> + <source>/yast/CODE11/Alpha6Test.xml</source> +  + <destination>/srv/SLEPOS/3</destination> + </itemcopy> + + <itemcopy> + <type>file</type> + <source>/yast/docs/Behavioral_Indicators_Release_2.3</source> +  + <destination>/srv/SLEPOS/4/</destination> + </itemcopy> + + <itemcopy> + <type>directory</type> + <source>/tmp/some/missing/dir</source> + <destination>/srv/SLEPOS/5/</destination> + </itemcopy> + +  + <itemcopy> + <type>directory</type> + <destination>/srv/SLEPOS/12/</destination> + </itemcopy> + +  + <itemcopy> + <type>dyrectori</type> + <source>/tmp/</source> + <destination>/tmp/</destination> + </itemcopy> + + </itemcopies> +</migrate> Added: trunk/pos-installation/doc/.cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/doc/.cvsignore?… ============================================================================== --- trunk/pos-installation/doc/.cvsignore (added) +++ trunk/pos-installation/doc/.cvsignore Wed Oct 10 14:08:04 2007 @@ -0,0 +1,2 @@ +Makefile +Makefile.in Added: trunk/pos-installation/doc/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/doc/Makefile.am… ============================================================================== --- trunk/pos-installation/doc/Makefile.am (added) +++ trunk/pos-installation/doc/Makefile.am Wed Oct 10 14:08:04 2007 @@ -0,0 +1,10 @@ +# Makefile.am for pos-installation/doc + +SUBDIRS = autodocs + +htmldir = $(docdir) + +doc_DATA = +html_DATA = + +EXTRA_DIST = $(doc_DATA) $(html_DATA) Added: trunk/pos-installation/doc/autodocs/.cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/doc/autodocs/.c… ============================================================================== --- trunk/pos-installation/doc/autodocs/.cvsignore (added) +++ trunk/pos-installation/doc/autodocs/.cvsignore Wed Oct 10 14:08:04 2007 @@ -0,0 +1,3 @@ +Makefile +Makefile.in +*.html Added: trunk/pos-installation/doc/autodocs/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/doc/autodocs/Ma… ============================================================================== --- trunk/pos-installation/doc/autodocs/Makefile.am (added) +++ trunk/pos-installation/doc/autodocs/Makefile.am Wed Oct 10 14:08:04 2007 @@ -0,0 +1,3 @@ +# Makefile.am for pos-installation/doc/autodocs + +include $(top_srcdir)/autodocs-ycp.ami Added: trunk/pos-installation/package/.cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/package/.cvsign… ============================================================================== --- trunk/pos-installation/package/.cvsignore (added) +++ trunk/pos-installation/package/.cvsignore Wed Oct 10 14:08:04 2007 @@ -0,0 +1,2 @@ +*.spec +*.bz2 Added: trunk/pos-installation/package/yast2-pos-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/package/yast2-p… ============================================================================== --- trunk/pos-installation/package/yast2-pos-installation.changes (added) +++ trunk/pos-installation/package/yast2-pos-installation.changes Wed Oct 10 14:08:04 2007 @@ -0,0 +1,7 @@ +------------------------------------------------------------------- +Wed Oct 10 13:52:53 2007 - locilka(a)suse.cz + +- initial version + * POS Data Migration client + * POS Pattern Selector +- 2.13.0 Added: trunk/pos-installation/src/.cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/src/.cvsignore?… ============================================================================== --- trunk/pos-installation/src/.cvsignore (added) +++ trunk/pos-installation/src/.cvsignore Wed Oct 10 14:08:04 2007 @@ -0,0 +1,4 @@ +Makefile +Makefile.in +*.ybc +.dep Added: trunk/pos-installation/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/src/Makefile.am… ============================================================================== --- trunk/pos-installation/src/Makefile.am (added) +++ trunk/pos-installation/src/Makefile.am Wed Oct 10 14:08:04 2007 @@ -0,0 +1,5 @@ +# +# Makefile.am for installation/src +# + +SUBDIRS = clients scripts Added: trunk/pos-installation/src/clients/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/src/clients/Mak… ============================================================================== --- trunk/pos-installation/src/clients/Makefile.am (added) +++ trunk/pos-installation/src/clients/Makefile.am Wed Oct 10 14:08:04 2007 @@ -0,0 +1,11 @@ +# Makefile.am for installation/general + +client_DATA = $(wildcard *.ycp) +YCPCFLAGS = -M ../modules + +EXTRA_DIST = $(client_DATA) + +install-data-local: + -install -d -m 755 $(DESTDIR)/var/lib/YaST2 + +include $(top_srcdir)/Makefile.am.common Added: trunk/pos-installation/src/clients/slepos_data_migration.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/src/clients/sle… ============================================================================== --- trunk/pos-installation/src/clients/slepos_data_migration.ycp (added) +++ trunk/pos-installation/src/clients/slepos_data_migration.ycp Wed Oct 10 14:08:04 2007 @@ -0,0 +1,947 @@ +{ + // Configuration + string migration_conf = "/etc/YaST2/slepos_migration.xml"; + + // Default values are defined in $migration_conf file + // Fallback values below + boolean default_do_backup = nil; + string default_backupdir = ""; + string default_backupname = ""; + integer migration_redraw_sleep = nil; + string migration_type = ""; + string slepos_migration_post_script = ""; + + // FIXME + textdomain "SLEPOS"; + + import "FileUtils"; + import "Wizard"; + import "Mode"; + import "Label"; + import "Popup"; + import "Sequencer"; + import "String"; + import "Report"; + + // Variables + + list <map> copy_data_dirs = []; + list <map> copy_data_files = []; + + string backup_archive = ""; + + // Functions + + integer size_kB = 1024; + integer size_MB = 1024 * 1024; + integer size_GB = 1024 * 1024 * 1024; + + string SizeInReadableFormat (integer size_in_b) { + integer current = (size_in_b / size_kB); + + // more than a kB + if (current > size_kB) { + current = (size_in_b / size_MB); + // more than a MB + if (current > size_kB) { + return sformat ("%1 GB", (size_in_b / size_MB)); + // less than a GB + } else { + return sformat ("%1 MB", current); + } + // less than a kB + } else { + return sformat ("%1 kB", current); + } + } + + void ParseOneDirItem (map one_item) { + string source = one_item["source"]:""; + string destination = one_item["destination"]:""; + + if (source == "") { + y2error (">source< not defined %1", one_item); + return; + } + + if (destination == "") { + y2error (">destination< not defined %1", one_item); + return; + } + + if (! regexpmatch (source, "/$")) { + source = source + "/"; + } + + if (! regexpmatch (destination, "/$")) { + destination = destination + "/"; + } + + if (! FileUtils::Exists (source)) { + y2warning ("Directory '%1' doesn't exist - it will not be migrated", source); + return; + } + + copy_data_dirs = add (copy_data_dirs, $[ + "source" : source, + "destination" : destination, + ]); + } + + void ParseOneFileItem (map one_item) { + string source = one_item["source"]:""; + string destination = one_item["destination"]:""; + + if (source == "") { + y2error (">source< not defined %1", one_item); + return; + } + + if (destination == "") { + y2error (">destination< not defined %1", one_item); + return; + } + + if (! regexpmatch (destination, "/$")) { + destination = destination + "/"; + } + + if (! FileUtils::Exists (source)) { + y2warning ("File '%1' doesn't exist - it will not be migrated", source); + return; + } + + copy_data_files = add (copy_data_files, $[ + "source" : source, + "destination" : destination, + ]); + } + + boolean ReadParseAndCheckXMLConfig () { + if (! FileUtils::Exists (migration_conf)) { + y2error ("Can't read migration config file!"); + return false; + } + + y2milestone ("Reading %1", migration_conf); + map <string, any> conf = (map <string, any>) SCR::Read (.xml, migration_conf); + + if (migration_conf == nil) { + y2error ("Can't parse migration config file!"); + return false; + } + + foreach (map one_item, (list <map <string, string> >) conf["itemcopies"]:[], { + if (one_item["type"]:nil == "directory") { + ParseOneDirItem (one_item); + } else if (one_item["type"]:nil == "file") { + ParseOneFileItem (one_item); + } else { + y2error ("Unknown type: %1", one_item); + } + }); + + /* --- parsing configuration --- */ + + if (conf["config","default_backupdir"]:"" != "") { + default_backupdir = conf["config","default_backupdir"]:""; + } else { + default_backupdir = "/var/adm/backup/SLEPOS_DATA/"; + } + + if (conf["config","default_backupname"]:"" != "") { + default_backupname = conf["config","default_backupname"]:""; + } else { + default_backupname = "SLEPOS_DATA_"; + } + + if (conf["config","migration_redraw_sleep"]:0 != 0) { + migration_redraw_sleep = conf["config","migration_redraw_sleep"]:50; + } else { + migration_redraw_sleep = 50; + } + + if (conf["config","migration_type"]:"" != "") { + migration_type = conf["config","migration_type"]:""; + } else { + migration_type = "copy"; + } + + if (conf["config","slepos_migration_post_script"]:"" != "") { + slepos_migration_post_script = conf["config","slepos_migration_post_script"]:""; + } else { + slepos_migration_post_script = ""; + } + + if (conf["config","default_do_backup"]:false != false) { + default_do_backup = conf["config","default_do_backup"]:false; + } else { + default_do_backup = false; + } + + /* --- parsing configuration --- */ + + y2milestone ("Dirs to migrate: %1", copy_data_dirs); + y2milestone ("Files to migrate: %1", copy_data_files); + + return true; + } + + void RedrawMigrationItems () { + list <term> items = []; + + integer counter = -1; + + foreach (map copy_data_dir, copy_data_dirs, { + counter = counter + 1; + items[counter] = `item ( + `id (counter), + _("Directory"), + copy_data_dir["source"]:"", + copy_data_dir["destination"]:"" + ); + }); + + foreach (map copy_data_file, copy_data_files, { + counter = counter + 1; + items[counter] = `item ( + `id (counter), + _("File"), + copy_data_file["source"]:"", + copy_data_file["destination"]:"" + ); + }); + + UI::ChangeWidget (`id (`migration_items), `Items, items); + } + + void DisplayMigrationDialog () { + Wizard::SetContentsButtons ( + _("Migration Asistent"), + `VBox ( + `VSpacing (1), + `RadioButtonGroup ( + `id (`skip_or_do_migration), + `VBox ( + `Left (`RadioButton (`id (`skip_migration), `opt (`notify, `boldFont), _("&Skip Migration"))), + `Left (`RadioButton (`id (`do_migrate), `opt (`notify, `boldFont), _("&Do Migrate"), true)) + ) + ), + `VSpacing (1), + `HBox ( + `HSpacing (4), + `VBox ( + `id (`migration_allitems), + `Left (`Label (_("These directories and files will be migrated"))), + `Table ( + `id (`migration_items), + `header ( + _("Type"), + _("From"), + _("To") + ), + [] + ), + `VSpacing (0.5), + `Left (`PushButton (`id (`details), _("&Migration Details..."))) + ) + ), + `VStretch (), + `Left (`Label (_("Note: Migration can take very long time according to the current size of your data."))) + ), + _("Some help - FIXME!!!!"), + Label::BackButton(), + Label::NextButton() + ); + + Wizard::SetTitleIcon ("yast-disk"); + + RedrawMigrationItems(); + } + + boolean ArchiveNameOK (string archive_name) { + // file doesn't exist, no problem with overwriting + if (! FileUtils::Exists (archive_name)) { + return true; + + // file already exists + } else if (FileUtils::IsFile (archive_name)) { + return (Popup::AnyQuestion ( + _("Warning"), + sformat(_("Archive %1 already exists. +Do you really want to overwrite it?"), archive_name), + _("&Yes, Overwrite"), + Label::NoButton(), + `no + )); + + // file is a directory + } else if (FileUtils::IsDirectory (archive_name)) { + Report::Error (sformat(_("Archive %1 is a directory. +Expecting file name instead."), archive_name)); + return false; + + // file is a socket, fifo, etc... + } else { + Report::Error ( + sformat (_("The file %1 is type '%2'. +It cannot be used for creating any backup archive."), archive_name, FileUtils::GetFileType (archive_name)) + ); + return false; + } + } + + void AdjustMigrationDialog () { + any current_button = (symbol) UI::QueryWidget (`id (`skip_or_do_migration), `CurrentButton); + + if (current_button == `skip_migration) { + UI::ChangeWidget (`id (`migration_allitems), `Enabled, false); + } else { + UI::ChangeWidget (`id (`migration_allitems), `Enabled, true); + } + } + + string CheckOrCreateArchiveName (string archive_name) { + // Archive Name is an existent directory + // but doesn't have a final slash + if (FileUtils::Exists (archive_name) && FileUtils::IsDirectory (archive_name) && !regexpmatch (archive_name, "/$")) { + archive_name = archive_name + "/"; + } + + // must be a directory + if (regexpmatch (archive_name, "/$")) { + map cmd = (map) WFM::Execute (.local.bash_output, "date +%Y%m%d-%H%M%S"); + list <string> a_name_list = splitstring(cmd["stdout"]:"the_latest", "\n"); + archive_name = archive_name + default_backupname + a_name_list[0]:"" + ".tar"; + } + + return archive_name; + } + + void HandleDetailsDialog () { + if (default_do_backup && backup_archive == "") { + backup_archive = default_backupdir; + } + + UI::OpenDialog ( + `VBox ( + `Heading (_("Migration Details")), + `VSpacing (1), + `Left (`Label (_("We recommend creating a backup copy of your data +before the migration starts."))), + `VSpacing (1), + `Left (`CheckBox (`id (`do_backup), `opt (`notify), _("Create a Backup &Archive"))), + `HBox ( + `MinWidth (50, `TextEntry (`id (`backup_archive), _("Archive &Location"), backup_archive)), + `HSpacing (1), + `VBox ( + `VSpacing (1), + `PushButton (`id (`browse), _("&Browse...")) + ) + ), + `VSpacing (1), + `HBox ( + `PushButton (`id (`ok), Label::OKButton()), + `HSpacing (2), + `PushButton (`id (`cancel), Label::CancelButton()) + ) + ) + ); + + if (backup_archive == "") { + UI::ChangeWidget (`id (`do_backup), `Value, false); + UI::ChangeWidget (`id (`backup_archive), `Enabled, false); + } else { + UI::ChangeWidget (`id (`do_backup), `Value, true); + UI::ChangeWidget (`id (`backup_archive), `Enabled, true); + } + + any ret = ""; + + while (true) { + ret = UI::UserInput(); + + if (ret == `cancel) { + break; + } else if (ret == `ok) { + if ((boolean) UI::QueryWidget (`id (`do_backup), `Value)) { + backup_archive = CheckOrCreateArchiveName ((string) UI::QueryWidget (`id (`backup_archive), `Value)); + + if (backup_archive == "") { + UI::SetFocus (`backup_archive); + Report::Error (_("Please, select a directory or an archive file.")); + continue; + } + } else { + backup_archive = ""; + } + + if (ArchiveNameOK (backup_archive)) break; + + // browse button pressed + } else if (ret == `browse) { + string existdir = UI::AskForExistingDirectory ( + (backup_archive == "" ? default_backupdir : backup_archive), + _("Backup Archive File Location") + ); + UI::ChangeWidget (`id (`backup_archive), `Value, existdir); + + // checkbox "do backup" selected + } else if (ret == `do_backup) { + boolean do_backup = (boolean) UI::QueryWidget (`id (`do_backup), `Value); + UI::ChangeWidget (`id (`backup_archive), `Enabled, do_backup); + + // if selected to make a backup and no default backup dir is printed + if (do_backup && UI::QueryWidget (`id (`backup_archive), `Value) == "") { + UI::ChangeWidget (`id (`backup_archive), `Value, default_backupdir); + } + + } else { + y2error ("Uknown ret: %1", ret); + } + } + + UI::CloseDialog(); + } + + symbol HandleMigrationDialog () { + any ret = nil; + + symbol dialog_ret = `next; + + while (true) { + ret = UI::UserInput(); + + if (ret == `back) { + dialog_ret = `back; + break; + } else if (ret == `next) { + any current_button = (symbol) UI::QueryWidget (`id (`skip_or_do_migration), `CurrentButton); + + if (current_button == `skip_migration) { + y2milestone ("Migration will be skipped"); + dialog_ret = `skip; + } else { + dialog_ret = `next; + } + + break; + } else if (ret == `skip_migration || ret == `do_migrate) { + AdjustMigrationDialog(); + } else if (ret == `abort) { + if (Mode::normal()) { + if (Popup::ReallyAbort (false)) { + dialog_ret = `abort; + break; + } + } else if (Popup::ConfirmAbort (`incomplete)) { + dialog_ret = `abort; + break; + } + } else if (ret == `details) { + HandleDetailsDialog(); + } else { + y2error ("Unknown ret: %1", ret); + } + } + + return dialog_ret; + } + + void DisplayMigrationProgress () { + Wizard::SetContentsButtons ( + _("Migration in Progress"), + `VBox ( + `ReplacePoint (`id (`rp_backup), `Empty ()), + `VSpacing (2), + `ReplacePoint (`id (`rp_migration), `Empty ()), + `VStretch () + ), + _("Some help - FIXME!!!!"), + Label::BackButton(), + Label::NextButton() + ); + + Wizard::SetTitleIcon ("yast-disk"); + } + + symbol InitialDialog () { + DisplayMigrationDialog(); + + symbol init_dialog_ret = HandleMigrationDialog(); + y2milestone ("InitDialog: %1", init_dialog_ret); + + return init_dialog_ret; + } + + integer backup_stats_dirs = 0; + integer backup_stats_files = 0; + string backup_stats_show = ""; + + integer backup_stats_dirs_last = 0; + integer backup_stats_files_last = 0; + + void UpdateBackupScreen () { + // no change + if (backup_stats_dirs == backup_stats_dirs_last && backup_stats_files == backup_stats_files_last) + return; + + backup_stats_dirs_last = backup_stats_dirs; + backup_stats_files_last = backup_stats_files; + + UI::ReplaceWidget ( + `id (`rp_backup), + `VBox ( + `Left (`Label (`opt (`boldFont), _("Backup statistics:"))), + `Left (`Label ( + sformat ( + "Current: %1\nTotal directories: %2\nTotal files: %3", + backup_stats_show, + backup_stats_dirs, + backup_stats_files + ) + )) + ) + ); + } + + void FinishBackupScreen () { + UI::ReplaceWidget ( + `id (`rp_backup), + `VBox ( + `Left (`Label (`opt (`boldFont), _("Backup statistics:"))), + `Left (`Label ( + sformat ( + "Total directories: %1\nTotal files: %2", + backup_stats_dirs, + backup_stats_files + ) + )), + `Left (`Label (`opt (`boldFont), _("Done"))) + ) + ); + } + + integer migrated_stats_dirs = 0; + integer migrated_stats_files = 0; + integer migrated_stats_size = 0; + string migrated_stats_show = ""; + + integer migrated_stats_dirs_last = 0; + integer migrated_stats_files_last = 0; + + void UpdateMigrationScreen () { + // no change + if (migrated_stats_dirs == migrated_stats_dirs_last && migrated_stats_files == migrated_stats_files_last) + return; + + migrated_stats_dirs_last = migrated_stats_dirs; + migrated_stats_files_last = migrated_stats_files; + + UI::ReplaceWidget ( + `id (`rp_migration), + `VBox ( + `Left (`Label (`opt (`boldFont), _("Migration statistics:"))), + `Left (`Label ( + sformat ( + "Current: %1\nTotal files: %2\nTotal size: %3", + migrated_stats_show, + migrated_stats_files, + SizeInReadableFormat (migrated_stats_size) + ) + )) + ) + ); + } + + void FinishMigrationScreen () { + UI::ReplaceWidget ( + `id (`rp_migration), + `VBox ( + `Left (`Label (`opt (`boldFont), _("Migration statistics:"))), + `Left (`Label ( + sformat ( + "Total files: %1\nTotal size: %2", + migrated_stats_files, + SizeInReadableFormat (migrated_stats_size) + ) + )), + `Left (`Label (`opt (`boldFont), _("Done"))) + ) + ); + } + + void AbortedMigrationScreen () { + UI::ReplaceWidget ( + `id (`rp_migration), + `VBox ( + `Left (`Label (`opt (`boldFont), _("Migration statistics:"))), + `Left (`Label ( + sformat ( + "Total files: %1", + migrated_stats_files + ) + )), + `Left (`Label (`opt (`boldFont), _("Aborted"))) + ) + ); + } + + boolean AbortBackup (any widget_id) { + if (widget_id != `abort) return false; + + if (Mode::normal()) { + return Popup::ReallyAbort (false); + } else { + return Popup::ConfirmAbort (`incomplete); + } + } + + boolean AbortMigration (any widget_id) { + if (widget_id != `abort) return false; + + if (Mode::normal()) { + return Popup::ReallyAbort (false); + } else { + return Popup::ConfirmAbort (`incomplete); + } + } + + boolean CreateBackupArchive () { + UI::ReplaceWidget ( + `id (`rp_backup), + `Left (`Label (_("Creating backup archive..."))) + ); + + string list_of_files_and_dirs = ""; + string one_item = ""; + + // dirs at first + foreach (map copy_data_dir, copy_data_dirs, { + one_item = copy_data_dir["source"]:""; + + if (one_item == "") { + y2error ("Invalid 'source': %1", copy_data_dir); + return; + } + + list_of_files_and_dirs = list_of_files_and_dirs + sformat (" '%1'", String::Quote (one_item)); + }); + + // then files + foreach (map copy_data_file, copy_data_files, { + one_item = copy_data_file["source"]:""; + + if (one_item == "") { + y2error ("Invalid 'source': %1", copy_data_file); + return; + } + + list_of_files_and_dirs = list_of_files_and_dirs + sformat (" '%1'", String::Quote (one_item)); + }); + + if (list_of_files_and_dirs == "") { + y2milestone ("Nothing to backup"); + return false; + } + + // at first the target directory needs to be created if it doesn't exist + string archive_dir = backup_archive; + integer position = findlastof (archive_dir, "/"); + archive_dir = substring (archive_dir, 0, position + 1); + + string cmd = sformat ( + "mkdir -p '%1'; tar -cvSf '%2' %3", + String::Quote (archive_dir), + String::Quote (backup_archive), + list_of_files_and_dirs + ); + y2milestone ("Executing: %1", cmd); + + SCR::Execute(.background.run_output_err, cmd); + + backup_stats_dirs = 0; + backup_stats_files = 0; + backup_stats_show = ""; + + while ((boolean) SCR::Read(.background.output_open) || (boolean) (SCR::Read(.background.newlines) > 0)) { + any widget_id = UI::PollInput(); + + if (AbortBackup(widget_id)) { + integer kill_count = 10; + while (kill_count > 0) { + kill_count = kill_count - 1; + if ((boolean) SCR::Execute (.background.kill)) break; + sleep (1000); + } + } + + if ((integer) SCR::Read (.background.newlines) > 0) { + list <string> lines = (list <string>) SCR::Read (.background.newout); + + foreach (string line, lines, { + if (regexpmatch (line, "/$")) { + backup_stats_dirs = backup_stats_dirs + 1; + } else { + backup_stats_files = backup_stats_files + 1; + } + backup_stats_show = line; + }); + } + + UpdateBackupScreen (); + sleep (migration_redraw_sleep); + } + + FinishBackupScreen (); + y2milestone ("Result: %1", SCR::Read (.background.status)); + + return true; + } + + boolean migration_aborted = false; + + boolean MigrateFromTo (string source, string target) { + if (source == "") { + y2error ("Invalid 'source': %1", source); + return false; + } + + if (target == "") { + y2error ("Invalid 'target': %1", target); + return false; + } + + // '/tmp/aaa/' -> '/tmp/aaa/.' + if (regexpmatch (source, "/$")) source = source + "."; + + string cmd = ""; + if (migration_type == "move") { + cmd = sformat ( + "mkdir -p '%2'; mv -vf '%1' '%2'", + String::Quote (source), + String::Quote (target) + ); + } else { + cmd = sformat ( + "mkdir -p '%2'; cp -avrf '%1' '%2'", + String::Quote (source), + String::Quote (target) + ); + } + + y2milestone ("Executing: %1", cmd); + + SCR::Execute(.background.run_output_err, cmd); + + string target_filename = ""; + + while ((boolean) SCR::Read (.background.output_open) || (boolean) (SCR::Read (.background.newlines) > 0)) { + any widget_id = UI::PollInput(); + + if (AbortMigration (widget_id)) { + migration_aborted = true; + integer kill_count = 10; + while (kill_count > 0) { + kill_count = kill_count - 1; + if ((boolean) SCR::Execute (.background.kill)) break; + sleep (1000); + } + } + + if ((integer) SCR::Read (.background.newlines) > 0) { + list <string> lines = (list <string>) SCR::Read (.background.newout); + + foreach (string line, lines, { + if (regexpmatch (line, "^`.*' -> `.*'$")) { + target_filename = line; + target_filename = regexpsub (line, "^`.*' -> `(.*)'$", "\\1"); + migrated_stats_size = migrated_stats_size + (integer) SCR::Read (.target.size, target_filename); + + line = regexpsub (line, "^`(.*) -> `.*'$", "\\1"); + } else if (regexpmatch (line, "^removed `.*'$")) { + return; + } else { + y2error ("Unknown line type: >%1<", line); + } + + if (regexpmatch (line, "/$")) { + migrated_stats_dirs = migrated_stats_dirs + 1; + } else { + migrated_stats_files = migrated_stats_files + 1; + } + + migrated_stats_show = line; + }); + } + + UpdateMigrationScreen (); + sleep (migration_redraw_sleep); + } + + y2milestone ("Result: %1", SCR::Read (.background.status)); + } + + boolean MigrateData () { + UI::ReplaceWidget ( + `id (`rp_migration), + `Left (`Label (_("Migrating data..."))) + ); + + migrated_stats_dirs = 0; + migrated_stats_files = 0; + migrated_stats_show = ""; + + string source = ""; + string target = ""; + + migration_aborted = false; + + // dirs at first + foreach (map copy_data_dir, copy_data_dirs, { + if (migration_aborted) { + y2milestone ("Aborted!"); + break; + } + + source = copy_data_dir["source"]:""; + target = copy_data_dir["destination"]:""; + + y2milestone ("Migrating: %1", copy_data_dir); + MigrateFromTo (source, target); + }); + + // then files + foreach (map copy_data_file, copy_data_files, { + if (migration_aborted) { + y2milestone ("Aborted!"); + break; + } + + source = copy_data_file["source"]:""; + target = copy_data_file["destination"]:""; + + y2milestone ("Migrating: %1", copy_data_file); + MigrateFromTo (source, target); + }); + + if (migration_aborted) { + AbortedMigrationScreen (); + } else { + FinishMigrationScreen (); + sleep (3000); + } + + return (migration_aborted == false); + } + + symbol MigrationDialog () { + DisplayMigrationProgress(); + + Wizard::DisableBackButton(); + Wizard::DisableNextButton(); + Wizard::EnableAbortButton(); + + if (backup_archive != "") { + CreateBackupArchive(); + } + + MigrateData(); + + Wizard::DisableAbortButton(); + Wizard::EnableBackButton(); + Wizard::EnableNextButton(); + + any ret = ""; + symbol dialog_ret = `next; + + while (true) { + ret = UI::UserInput(); + + if (ret == `back) { + dialog_ret = `back; + break; + } else if (ret == `next) { + dialog_ret = `next; + break; + // e.g., `cancel + } else { + y2error ("Unknow ret: %1", ret); + } + } + + Wizard::EnableAbortButton(); + + return dialog_ret; + } + + symbol MigrationPostScript () { + if (! FileUtils::Exists (slepos_migration_post_script)) { + y2warning ("Script '%1' doesn't exist, skipping...", slepos_migration_post_script); + return `next; + } + + Wizard::SetContentsButtons ( + _("Migration Asistent"), + `VBox ( + `Label (_("Running post-migration script...")) + ), + _("Some help - FIXME!!!!"), + Label::BackButton(), + Label::NextButton() + ); + + Wizard::DisableAbortButton(); + Wizard::SetTitleIcon ("yast-disk"); + + y2milestone ("Running: %1", slepos_migration_post_script); + map cmd = (map) SCR::Execute (.target.bash_output, slepos_migration_post_script); + y2milestone ("Ret: %1", cmd); + + Wizard::EnableAbortButton(); + + return `next; + } + + // main() + + map aliases = $[ + "initial" : ``( InitialDialog () ), + "migrate" : ``( MigrationDialog() ), + "postscript" : ``( MigrationPostScript() ), + ]; + + map sequence = $[ + "ws_start" : "initial", + "initial" : $[ + `next : "migrate", + `skip : `next, + `abort : `abort, + ], + "migrate" : $[ + `next : "postscript", + `abort : `abort, + ], + "postscript" : $[ + `next : `next, + `abort : `abort, + ], + ]; + + Wizard::CreateDialog(); + + if (! ReadParseAndCheckXMLConfig()) { + Report::Error (sformat ( + _("Unable to read migration configuration from %1"), + migration_conf + )); + return `next; + } + + any ret = Sequencer::Run (aliases, sequence); + y2milestone ("Sequencer::Run %1", ret); + + Wizard::CloseDialog(); + + return (symbol) ret; +} \ No newline at end of file Added: trunk/pos-installation/src/clients/slepos_server_selection.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/src/clients/sle… ============================================================================== --- trunk/pos-installation/src/clients/slepos_server_selection.ycp (added) +++ trunk/pos-installation/src/clients/slepos_server_selection.ycp Wed Oct 10 14:08:04 2007 @@ -0,0 +1,188 @@ +/** + */ + +{ + // FIXME + textdomain "SLEPOS"; + + import "Wizard"; + import "Label"; + import "Popup"; + import "Installation"; + import "Mode"; + import "Report"; + import "Stage"; + import "PackageCallbacks"; + + if (Mode::normal()) + Wizard::CreateDialog(); + + list <map <string, string> > list_of_patterns = [ + $[ + "label" : _("Admin Server Installation"), + "name" : "SLEPOS_Server_Admin", + "icon" : "/usr/share/icons/hicolor/32x32/apps/yast-powertweak.png", + ], + $[ + "label" : _("Branch Server Installation"), + "name" : "SLEPOS_Server_Branch", + "icon" : "/usr/share/icons/hicolor/32x32/apps/yast-iscsi-server.png", + ], + $[ + "label" : _("Image Server Installation"), + "name" : "SLEPOS_Image_Server", + "icon" : "/usr/share/icons/hicolor/32x32/apps/yast-instserver.png", + ], + ]; + + list <string> all_patterns_in_selection = []; + + void InitTargetNow () { + Pkg::SourceStartManager (true); + Pkg::TargetInit (Installation::destdir, false); + } + + string GetPatternLabel (string pattern_name) { + string pattern_label = pattern_name; + + foreach (map <string, string> one_pattern, list_of_patterns, { + if (one_pattern["name"]:nil == pattern_name) { + pattern_label = one_pattern["label"]:pattern_name; + break; + } + }); + + return pattern_label; + } + + boolean HandleSelectedRadioButton () { + string current_button = (string) UI::QueryWidget (`id (`selected_pattern), `CurrentButton); + + if (current_button == "detailed") { + InitTargetNow(); + any ret = WFM::call ("inst_packages", [`patterns]); + + // user didn't accept the pattern selector + if (ret != `accept) { + return false; + } else { + return true; + } + } else if (regexpmatch (current_button, "^pattern: .*$")) { + InitTargetNow(); + + foreach (string pattern_neutral, all_patterns_in_selection, { + list <map <string,any> > current_pattern_state = Pkg::ResolvableProperties (pattern_neutral, `pattern, ""); + if (size (current_pattern_state) == 0) { + y2error ("No such pattern: %1", pattern_neutral); + return; + } + Pkg::ResolvableNeutral (pattern_neutral, `pattern, (Stage::initial() ? true:false)); + }); + + string pattern_to_select = regexpsub (current_button, "^pattern: (.*)$", "\\1"); + + if (Pkg::ResolvableInstall (pattern_to_select, `pattern) == true) { + Pkg::PkgSolve (false); + return true; + } else { + Report::Error (sformat(_("Unable to select pattern '%1'"), GetPatternLabel (pattern_to_select))); + return false; + } + } else { + y2error ("Unknown current button: %1", current_button); + return false; + } + } + + term CreateRadioButtonTerm (string pattern_name, string pattern_label, string pattern_icon) { + return `HBox ( + `HWeight ( + 1, + `Right (pattern_icon == "" ? `Empty() : `Image (pattern_icon, "")) + ), + `HSpacing (2), + `HWeight ( + 2, + `Left (`RadioButton ( + `id (pattern_name), + pattern_label + )) + ) + ); + } + + term term_patterns = `VBox (); + + foreach (map <string, string> one_pattern, list_of_patterns, { + all_patterns_in_selection = add (all_patterns_in_selection, one_pattern["name"]:""); + + term_patterns = add ( + term_patterns, + CreateRadioButtonTerm ( + sformat ("pattern: %1", one_pattern["name"]:""), + one_pattern["label"]:"", + one_pattern["icon"]:"" + ) + ); + term_patterns = add (term_patterns, `VSpacing (0.7)); + }); + + term_patterns = add (term_patterns, `VSpacing (1)); + term_patterns = add ( + term_patterns, + CreateRadioButtonTerm ( + "detailed", + _("Detailed Selection"), + "" + ) + ); + + Wizard::SetContentsButtons ( + _("Server Pattern Selection"), + `RadioButtonGroup ( + `id (`selected_pattern), + `opt (`notify), + term_patterns + ), + _("Some help - FIXME!!!!"), + Label::BackButton(), + Label::NextButton() + ); + + Wizard::SetTitleIcon ("yast-software"); + + any ret = nil; + + symbol dialog_ret = `next; + + while (true) { + ret = UI::UserInput(); + + if (ret == `next) { + dialog_ret = `next; + if (HandleSelectedRadioButton()) { + break; + } else { + continue; + } + } else if (ret == `back) { + dialog_ret = `back; + break; + } else if (ret == `abort || ret == `cancel) { + if (Popup::ConfirmAbort (`incomplete)) { + dialog_ret = `abort; + break; + } else { + continue; + } + } else { + y2error ("Unhandled ret: %1", ret); + } + } + + if (Mode::normal()) + Wizard::CloseDialog(); + + return dialog_ret; +} Added: trunk/pos-installation/src/scripts/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/src/scripts/Mak… ============================================================================== --- trunk/pos-installation/src/scripts/Makefile.am (added) +++ trunk/pos-installation/src/scripts/Makefile.am Wed Oct 10 14:08:04 2007 @@ -0,0 +1,8 @@ +# Makefile.am for installation/general + +client_DATA = $(wildcard *.*) + +install-data-local: + -install -d -m 755 $(DESTDIR)/var/lib/YaST2 + +include $(top_srcdir)/Makefile.am.common Added: trunk/pos-installation/src/scripts/slepos_post.pl URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/src/scripts/sle… ============================================================================== --- trunk/pos-installation/src/scripts/slepos_post.pl (added) +++ trunk/pos-installation/src/scripts/slepos_post.pl Wed Oct 10 14:08:04 2007 @@ -0,0 +1,9 @@ +#!/usr/bin/perl -w + +print "Aha\n"; + +sleep (2); + +warn "Ahaaaaaaa\n"; + +exit 0; Added: trunk/pos-installation/testsuite/.cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/testsuite/.cvsi… ============================================================================== --- trunk/pos-installation/testsuite/.cvsignore (added) +++ trunk/pos-installation/testsuite/.cvsignore Wed Oct 10 14:08:04 2007 @@ -0,0 +1,11 @@ +Makefile +Makefile.in +site.exp +*.sum +*.log +tmp.out* +tmp.err* +tmp.log* +config +run +*.test Added: trunk/pos-installation/testsuite/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/testsuite/Makef… ============================================================================== --- trunk/pos-installation/testsuite/Makefile.am (added) +++ trunk/pos-installation/testsuite/Makefile.am Wed Oct 10 14:08:04 2007 @@ -0,0 +1,21 @@ +# +# Makefile.am for .../testsuite +# +# Do not edit this file (Makefile.am) as it will be overwritten! +# + +AUTOMAKE_OPTIONS = dejagnu +EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) $(wildcard tests/*.yh) + +testsuite_prepare = @ydatadir@/testsuite/Makefile.testsuite + +all-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) + +clean-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) clean + +check-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) check + +# EOF Added: trunk/pos-installation/testsuite/tests/.cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/testsuite/tests… ============================================================================== (empty) Added: trunk/pos-installation/yast2-pos-installation.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/yast2-pos-insta… ============================================================================== --- trunk/pos-installation/yast2-pos-installation.spec.in (added) +++ trunk/pos-installation/yast2-pos-installation.spec.in Wed Oct 10 14:08:04 2007 @@ -0,0 +1,31 @@ +@HEADER-COMMENT@ + +@HEADER@ +Requires: yast2 +BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite + +BuildArchitectures: noarch + +Summary: Configuration of pos-installation + +%description +- + +@PREP@ + +@BUILD@ + +@INSTALL@ + +@CLEAN@ + +%files +%defattr(-,root,root) +%dir @yncludedir@/pos-installation +@yncludedir@/pos-installation/* +@clientdir@/pos-installation.ycp +@clientdir@/pos-installation_*.ycp +@moduledir@/PosInstallation.* +@moduledir@/PosInstallation2.* +@desktopdir@/pos-installation.desktop +%doc @docdir@ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41315 - /tags/branch-Linux-10_3-2_15_3/ca-management/
by mcalmer＠svn.opensuse.org 10 Oct '07

10 Oct '07

Author: mcalmer Date: Wed Oct 10 13:45:04 2007 New Revision: 41315 URL: http://svn.opensuse.org/viewcvs/yast?rev=41315&view=rev Log: Created tag branch-Linux-10_3-2_15_3 for ca-management Added: tags/branch-Linux-10_3-2_15_3/ca-management/ - copied from r41314, branches/SuSE-Linux-10_3-Branch/ca-management/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41314 - /tags/branch-SLE-10-SP1-2_13_33/ca-management/
by mcalmer＠svn.opensuse.org 10 Oct '07

10 Oct '07

Author: mcalmer Date: Wed Oct 10 13:41:51 2007 New Revision: 41314 URL: http://svn.opensuse.org/viewcvs/yast?rev=41314&view=rev Log: Created tag branch-SLE-10-SP1-2_13_33 for ca-management Added: tags/branch-SLE-10-SP1-2_13_33/ca-management/ - copied from r41313, branches/SuSE-SLE-10-SP1-Branch/ca-management/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41313 - in /branches/SuSE-Linux-10_3-Branch/ca-management: VERSION package/yast2-ca-management.changes src/crlDefault.ycp src/new_cert_read_write.ycp src/util.ycp
by mcalmer＠svn.opensuse.org 10 Oct '07

10 Oct '07

Author: mcalmer Date: Wed Oct 10 13:02:18 2007 New Revision: 41313 URL: http://svn.opensuse.org/viewcvs/yast?rev=41313&view=rev Log: version 2.15.3 Modified: branches/SuSE-Linux-10_3-Branch/ca-management/VERSION branches/SuSE-Linux-10_3-Branch/ca-management/package/yast2-ca-management.changes branches/SuSE-Linux-10_3-Branch/ca-management/src/crlDefault.ycp branches/SuSE-Linux-10_3-Branch/ca-management/src/new_cert_read_write.ycp branches/SuSE-Linux-10_3-Branch/ca-management/src/util.ycp Modified: branches/SuSE-Linux-10_3-Branch/ca-management/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/ca-man… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/ca-management/VERSION (original) +++ branches/SuSE-Linux-10_3-Branch/ca-management/VERSION Wed Oct 10 13:02:18 2007 @@ -1 +1 @@ -2.15.2 +2.15.3 Modified: branches/SuSE-Linux-10_3-Branch/ca-management/package/yast2-ca-management.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/ca-man… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/ca-management/package/yast2-ca-management.changes (original) +++ branches/SuSE-Linux-10_3-Branch/ca-management/package/yast2-ca-management.changes Wed Oct 10 13:02:18 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Oct 10 12:58:12 CEST 2007 - mc(a)suse.de + +- version 2.15.3 +- fix logging [#332002] +- fix request generation [#326465] + +------------------------------------------------------------------- Tue Aug 14 13:38:04 CEST 2007 - jsuchome(a)suse.cz - minimal support for command line interface (#300183) Modified: branches/SuSE-Linux-10_3-Branch/ca-management/src/crlDefault.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/ca-man… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/ca-management/src/crlDefault.ycp (original) +++ branches/SuSE-Linux-10_3-Branch/ca-management/src/crlDefault.ycp Wed Oct 10 13:02:18 2007 @@ -252,6 +252,10 @@ param["caPasswd"] = getPassword(ca); boolean writeret = (boolean) YaPI::CaManagement::WriteCRLDefaults (param); + + // we do not want to log the password + param["caPasswd"] = "<was set>"; + y2milestone ("WriteCRLDefaults(%1) return %2", param, writeret); if (writeret == nil Modified: branches/SuSE-Linux-10_3-Branch/ca-management/src/new_cert_read_write.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/ca-man… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/ca-management/src/new_cert_read_write.ycp (original) +++ branches/SuSE-Linux-10_3-Branch/ca-management/src/new_cert_read_write.ycp Wed Oct 10 13:02:18 2007 @@ -749,6 +749,7 @@ ||kind == "Sub CA Request") { param["caName"] = CaMgm::currentCA; + param["caPasswd"] = getPassword(CaMgm::currentCA); } if (kind == "Server Certificate") { @@ -1272,7 +1273,7 @@ || kind == "Client Request" || kind == "Sub CA Request") { - y2milestone("CaManagement::AddRequest(%1)", param); +// y2milestone("CaManagement::AddRequest(%1)", param); return YaPI::CaManagement::AddRequest (param) == nil ? false:true; } } @@ -1293,7 +1294,8 @@ // fillup parameters depending on kind param["caName"] = CaMgm::currentCA; - param["caPasswd"] = getPassword(CaMgm::currentCA); + // set the real password later. + param["caPasswd"] = "<was set>"; param["certType"] = kindmap[CaMgm::currentDefault]:""; if (CaMgm::adv_ca != "none") @@ -1692,6 +1694,10 @@ } y2milestone("CaManagement::WriteCertificateDefaults(%1)", param); + + // now set the password + param["caPasswd"] = getPassword(CaMgm::currentCA); + return YaPI::CaManagement::WriteCertificateDefaults (param); } Modified: branches/SuSE-Linux-10_3-Branch/ca-management/src/util.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/ca-man… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/ca-management/src/util.ycp (original) +++ branches/SuSE-Linux-10_3-Branch/ca-management/src/util.ycp Wed Oct 10 13:02:18 2007 @@ -1129,19 +1129,19 @@ string filename = (string) SCR::Read (.target.tmpdir) + "/commonCertificate"; string ret = (string) YaPI::CaManagement::ExportCertificate ($["caName": CAname, - "caPasswd" : getPassword (CAname), - "certificate" : certificate, - "keyPasswd" : password, - "exportFormat" : "PKCS12_CHAIN", - "destinationFile" : filename, - "P12Password" : password - ]); + "caPasswd" : getPassword (CAname), + "certificate" : certificate, + "keyPasswd" : password, + "exportFormat" : "PKCS12_CHAIN", + "destinationFile" : filename, + "P12Password" : password + ]); y2milestone ("ExportCertificate(%1) return %2", $["caName": CAname, - "certificate" : certificate, - "destinationFile" : filename, - "P12Password" : password - ], ret); + "certificate" : certificate, + "exportFormat" : "PKCS12_CHAIN", + "destinationFile" : filename + ], ret); if (ret == nil || ret != "1") { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0