Hello community,
here is the log from the commit of package yast2-update for openSUSE:Factory
checked in at Mon Jan 24 15:53:50 CET 2011.
--------
--- yast2-update/yast2-update.changes 2010-04-23 15:19:27.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-update/yast2-update.changes 2011-01-19 14:16:58.000000000 +0100
@@ -1,0 +2,11 @@
+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
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-update.spec ++++++
--- /var/tmp/diff_new_pack.itrOJ1/_old 2011-01-24 15:52:26.000000000 +0100
+++ /var/tmp/diff_new_pack.itrOJ1/_new 2011-01-24 15:52:26.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package yast2-update (Version 2.19.1)
+# spec file for package yast2-update
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
Name: yast2-update
Version: 2.19.1
-Release: 1
+Release: 4
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-update-2.19.1.tar.bz2
@@ -126,6 +126,7 @@
/usr/share/YaST2/clients/packages_proposal.ycp
/usr/share/YaST2/clients/backup_proposal.ycp
/usr/share/YaST2/clients/inst_update_partition.ycp
+/usr/share/YaST2/clients/inst_update_partition_auto.ycp
/usr/share/YaST2/clients/rootpart_check_keyboard.ycp
/usr/share/YaST2/include/update
++++++ yast2-update-2.19.1.tar.bz2 ++++++
++++ 4956 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-update-2.19.1/src/clients/Makefile.am new/yast2-update-2.19.1/src/clients/Makefile.am
--- old/yast2-update-2.19.1/src/clients/Makefile.am 2009-07-21 16:38:01.000000000 +0200
+++ new/yast2-update-2.19.1/src/clients/Makefile.am 2011-01-18 14:14:58.000000000 +0100
@@ -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)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-update-2.19.1/src/clients/inst_update_partition_auto.ycp new/yast2-update-2.19.1/src/clients/inst_update_partition_auto.ycp
--- old/yast2-update-2.19.1/src/clients/inst_update_partition_auto.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-update-2.19.1/src/clients/inst_update_partition_auto.ycp 2011-01-18 14:14:58.000000000 +0100
@@ -0,0 +1,68 @@
+/**
+ * Module: inst_update_partition.ycp
+ *
+ * Authors: Stefan Schubert
+ * Arvin Schnell
+ *
+ * Purpose: Select root partition for update or booting.
+ * RootPart::rootPartitions must be filled before
+ * calling this module.
+ *
+ * $Id:$
+ */
+{
+textdomain "update";
+
+import "ProductControl";
+import "RootPart";
+
+include "update/rootpart.ycp";
+
+if (RootPart::Mounted ()) {
+ Update::Detach ();
+ RootPart::UnmountPartitions (false);
+}
+
+RootPart::Detect ();
+// if there is only one suitable partition which can be mounted, use it without asking
+string target_system = "";
+
+
+map partitions = filter (string name, map p, RootPart::rootPartitions, {
+ if (p[`valid]:false)
+ target_system = name;
+ return p[`valid]:false;
+});
+
+if (size (partitions) == 1)
+{
+ y2milestone ("Auto-mounting system located at %1", target_system);
+ RootPart::selectedRootPartition = target_system;
+ RootPart::targetOk = RootPart::mount_target ();
+
+ // Not mounted correctly
+ if (! RootPart::targetOk) {
+ // error report
+ Report::Error (_("Failed to mount target system"));
+ UmountMountedPartition();
+ // Correctly mounted but incomplete installation found
+ } else if (RootPart::IncompleteInstallationDetected (Installation::destdir)) {
+ Report::Error (_("A possibly incomplete installation has been detected."));
+ UmountMountedPartition();
+ }
+ else if (!(Pkg::TargetInitialize (Installation::destdir) && Pkg::TargetLoad()))
+ {
+ Report::Error ("Initializing the target system failed");
+ UmountMountedPartition();
+ Pkg::TargetFinish();
+ }
+ else
+ {
+ return `next;
+ }
+}
+symbol ret = RootPartitionDialog (`update_dialog);
+
+return ret;
+
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-update-2.19.1/src/include/rootpart.ycp new/yast2-update-2.19.1/src/include/rootpart.ycp
--- old/yast2-update-2.19.1/src/include/rootpart.ycp 2010-04-23 15:15:44.000000000 +0200
+++ new/yast2-update-2.19.1/src/include/rootpart.ycp 2011-01-18 14:16:26.000000000 +0100
@@ -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) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-update-2.19.1/src/modules/RootPart.ycp new/yast2-update-2.19.1/src/modules/RootPart.ycp
--- old/yast2-update-2.19.1/src/modules/RootPart.ycp 2010-04-19 12:27:59.000000000 +0200
+++ new/yast2-update-2.19.1/src/modules/RootPart.ycp 2011-01-19 14:13:48.000000000 +0100
@@ -6,7 +6,7 @@
* Purpose: Responsible for searching of root partitions and
* mounting of target partitions.
*
- * $Id: RootPart.ycp 61748 2010-04-19 10:27:58Z aschnell $
+ * $Id: RootPart.ycp 63220 2011-01-19 13:13:47Z jsrain $
*/
{
module "RootPart";
@@ -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);
- Popup::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)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org