[yast-commit] r63220 - in /trunk/update: package/yast2-update.changes src/clients/Makefile.am src/include/rootpart.ycp src/modules/RootPart.ycp yast2-update.spec.in

Author: jsrain Date: Wed Jan 19 14:13:47 2011 New Revision: 63220 URL: http://svn.opensuse.org/viewcvs/yast?rev=63220&view=rev Log: adaptations for unattended migration (fate#310481) Modified: trunk/update/package/yast2-update.changes trunk/update/src/clients/Makefile.am trunk/update/src/include/rootpart.ycp trunk/update/src/modules/RootPart.ycp trunk/update/yast2-update.spec.in Modified: trunk/update/package/yast2-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/package/yast2-update.changes?rev=63220&r1=63219&r2=63220&view=diff ============================================================================== --- trunk/update/package/yast2-update.changes (original) +++ trunk/update/package/yast2-update.changes Wed Jan 19 14:13:47 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jan 19 14:11:44 CET 2011 - jsrain@suse.cz + +- adaptations for unattended migration (fate#310481) +- 2.20.0. + +------------------------------------------------------------------- Thu Oct 28 14:34:16 CEST 2010 - ug@suse.de - replaced a Popup:: by a Report:: for autoinstallation Modified: trunk/update/src/clients/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/clients/Makefile.am?rev=63220&r1=63219&r2=63220&view=diff ============================================================================== --- trunk/update/src/clients/Makefile.am (original) +++ trunk/update/src/clients/Makefile.am Wed Jan 19 14:13:47 2011 @@ -13,6 +13,7 @@ backup_proposal.ycp \ update.ycp \ inst_update_partition.ycp \ + inst_update_partition_auto.ycp \ run_update.ycp EXTRA_DIST = $(client_DATA) Modified: trunk/update/src/include/rootpart.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/include/rootpart.ycp?rev=63220&r1=63219&r2=63220&view=diff ============================================================================== --- trunk/update/src/include/rootpart.ycp (original) +++ trunk/update/src/include/rootpart.ycp Wed Jan 19 14:13:47 2011 @@ -21,6 +21,7 @@ import "Update"; import "Installation"; import "FileSystems"; +import "Mode"; // Returns boolean whether partition can be // a Linux 'root' file system @@ -223,6 +224,8 @@ if (flavor == `update_dialog) { Wizard::SetContents (title, contents, help_text, true, true); + if (Mode::autoupgrade()) + Wizard::EnableAbortButton(); } else if (flavor == `update_dialog_proposal) { @@ -286,6 +289,8 @@ else ret = UI::UserInput (); + if (ret == `cancel) + ret = `abort; if (ret == `abort && Popup::ConfirmAbort (`painless)) break; @@ -372,6 +377,8 @@ if (flavor != `update_dialog) UI::CloseDialog (); + else if (Mode::autoupgrade()) + Wizard::DisableAbortButton(); // New partition has been mounted if (flavor == `update_dialog && ret == `next) { Modified: trunk/update/src/modules/RootPart.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/modules/RootPart.ycp?rev=63220&r1=63219&r2=63220&view=diff ============================================================================== --- trunk/update/src/modules/RootPart.ycp (original) +++ trunk/update/src/modules/RootPart.ycp Wed Jan 19 14:13:47 2011 @@ -585,6 +585,12 @@ // such as /dev/sdc4 -> /dev/hdb4 map backward_translation = $[]; + string update_mount_options (string options) { + if (regexpmatch (options, "^\(.*,\)\?hotplug\(,.*\)\?$")) + return regexpsub (options, "^\(.*,\)\?hotplug\(,.*\)\?$", "\\1nofail\\2"); + return options; + } + /** * Translates FS or Cryptotab (old devices to new ones). * Such as /dev/hda5 to /dev/sda5. @@ -633,6 +639,8 @@ translate[i, key_preserve_as] = default_val; backward_translation[new_val] = default_val; + translate[i, "mntops"] = update_mount_options (translate[i, "mntops"]:""); + i = i + 1; }; @@ -1383,10 +1391,15 @@ if (FstabUsesKernelDeviceNameForHarddisks(fstab)) { y2warning("fstab on %1 uses kernel device name for hard disks", root_device_current); - Report::Warning(sformat(_("Some partitions in the system on %1 are mounted by kernel-device name. This is + string warning = sformat(_("Some partitions in the system on %1 are mounted by kernel-device name. This is not reliable for the update since kernel-device names are unfortunately not persistent. It is strongly recommended to start the old system and change the -mount-by method to any other method for all partitions."), root_device_current)); +mount-by method to any other method for all partitions."), root_device_current); + if (Mode::autoupgrade()) { + Popup::TimedWarning(warning, 10); + } else { + Popup::Warning(warning); + } } if (size (fstab) == 0) Modified: trunk/update/yast2-update.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/yast2-update.spec.in?rev=63220&r1=63219&r2=63220&view=diff ============================================================================== --- trunk/update/yast2-update.spec.in (original) +++ trunk/update/yast2-update.spec.in Wed Jan 19 14:13:47 2011 @@ -79,6 +79,7 @@ @clientdir@/packages_proposal.ycp @clientdir@/backup_proposal.ycp @clientdir@/inst_update_partition.ycp +@clientdir@/inst_update_partition_auto.ycp @clientdir@/rootpart_check_keyboard.ycp @yncludedir@/update -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org