Hello community,
here is the log from the commit of package yast2-update
checked in at Fri Oct 13 16:18:32 CEST 2006.
--------
--- yast2-update/yast2-update.changes 2006-10-09 17:07:50.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-update/yast2-update.changes 2006-10-13 13:34:47.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Oct 13 12:38:16 CEST 2006 - locilka@suse.cz
+
+- Fixed handling of errors in log during update.
+- Skipping modprobe for sysfs and proc (both #211916)
+- 2.14.1
+
+-------------------------------------------------------------------
Old:
----
yast2-update-2.14.0.tar.bz2
New:
----
yast2-update-2.14.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-update.spec ++++++
--- /var/tmp/diff_new_pack.0oxcGE/_old 2006-10-13 16:18:13.000000000 +0200
+++ /var/tmp/diff_new_pack.0oxcGE/_new 2006-10-13 16:18:13.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-update (Version 2.14.0)
+# spec file for package yast2-update (Version 2.14.1)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-update
-Version: 2.14.0
+Version: 2.14.1
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-update-2.14.0.tar.bz2
+Source0: yast2-update-2.14.1.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-bootloader yast2-devtools yast2-mouse yast2-packager yast2-testsuite yast2-xml
Requires: yast2 yast2-installation yast2-storage yast2-packager
@@ -40,7 +40,7 @@
Jiri Srain
%prep
-%setup -n yast2-update-2.14.0
+%setup -n yast2-update-2.14.1
%build
%{prefix}/bin/y2tool y2autoconf
@@ -75,6 +75,10 @@
%doc %{prefix}/share/doc/packages/yast2-update
%changelog -n yast2-update
+* Fri Oct 13 2006 - locilka@suse.cz
+- Fixed handling of errors in log during update.
+- Skipping modprobe for sysfs and proc (both #211916)
+- 2.14.1
* Mon Oct 09 2006 - locilka@suse.cz
- Merged SLES10 SP1 branch to openSUSE 10.2.
- 2.14.0
++++++ yast2-update-2.14.0.tar.bz2 -> yast2-update-2.14.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.14.0/VERSION new/yast2-update-2.14.1/VERSION
--- old/yast2-update-2.14.0/VERSION 2006-10-09 17:08:06.000000000 +0200
+++ new/yast2-update-2.14.1/VERSION 2006-10-13 13:34:59.000000000 +0200
@@ -1 +1 @@
-2.14.0
+2.14.1
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.14.0/src/clients/backup_proposal.ycp new/yast2-update-2.14.1/src/clients/backup_proposal.ycp
--- old/yast2-update-2.14.0/src/clients/backup_proposal.ycp 2006-10-09 15:55:01.000000000 +0200
+++ new/yast2-update-2.14.1/src/clients/backup_proposal.ycp 2006-10-13 13:39:55.000000000 +0200
@@ -4,6 +4,8 @@
* Author: Arvin Schnell
*
* Purpose: Let user choose backup during update.
+ *
+ * $Id: backup_proposal.ycp 33392 2006-10-13 11:39:53Z locilka $
*/
{
textdomain "update";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.14.0/src/clients/inst_backup.ycp new/yast2-update-2.14.1/src/clients/inst_backup.ycp
--- old/yast2-update-2.14.0/src/clients/inst_backup.ycp 2006-10-09 15:55:01.000000000 +0200
+++ new/yast2-update-2.14.1/src/clients/inst_backup.ycp 2006-10-13 13:39:55.000000000 +0200
@@ -5,14 +5,14 @@
* Arvin Schnell
*
* Purpose: Ask the user for backups during the update.
+ *
+ * $Id: inst_backup.ycp 33392 2006-10-13 11:39:53Z locilka $
*/
{
textdomain "update";
- import "Arch";
import "Mode";
- import "Installation";
import "Update";
import "SpaceCalculation";
import "Wizard";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.14.0/src/clients/inst_rootpart.ycp new/yast2-update-2.14.1/src/clients/inst_rootpart.ycp
--- old/yast2-update-2.14.0/src/clients/inst_rootpart.ycp 2006-10-09 15:55:01.000000000 +0200
+++ new/yast2-update-2.14.1/src/clients/inst_rootpart.ycp 2006-10-13 13:39:55.000000000 +0200
@@ -7,18 +7,13 @@
* Purpose: Select root partition for update or booting.
* RootPart::rootPartitions must be filled before
* calling this module.
+ * $Id: inst_rootpart.ycp 33392 2006-10-13 11:39:53Z locilka $
*/
{
textdomain "update";
-import "Wizard";
-import "Popup";
-import "Label";
-import "RootPart";
-
include "update/rootpart.ycp";
-
// This dialog comes in three different flavors: `update_dialog,
// `update_popup and `boot_popup
symbol flavor = (symbol) WFM::Args (2);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.14.0/src/clients/inst_update.ycp new/yast2-update-2.14.1/src/clients/inst_update.ycp
--- old/yast2-update-2.14.0/src/clients/inst_update.ycp 2006-10-09 15:55:01.000000000 +0200
+++ new/yast2-update-2.14.1/src/clients/inst_update.ycp 2006-10-13 13:39:55.000000000 +0200
@@ -8,14 +8,13 @@
* Displays software selection screen of previous installed software-groups.
* Show checkboxes for software categories. Let the user select his software.
* if he want to UPGRADE his system.
+ *
+ * $Id: inst_update.ycp 33392 2006-10-13 11:39:53Z locilka $
*/
{
textdomain "update";
- import "Mode";
- import "Installation";
- import "Language";
import "Wizard";
import "Popup";
import "RootPart";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.14.0/src/clients/inst_update_partition.ycp new/yast2-update-2.14.1/src/clients/inst_update_partition.ycp
--- old/yast2-update-2.14.0/src/clients/inst_update_partition.ycp 2006-10-09 15:55:01.000000000 +0200
+++ new/yast2-update-2.14.1/src/clients/inst_update_partition.ycp 2006-10-13 13:33:39.000000000 +0200
@@ -7,16 +7,14 @@
* Purpose: Select root partition for update or booting.
* RootPart::rootPartitions must be filled before
* calling this module.
+ *
+ * $Id:$
*/
{
textdomain "update";
-import "Wizard";
-import "Popup";
-import "Label";
import "ProductControl";
import "RootPart";
-import "Update";
include "update/rootpart.ycp";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.14.0/src/clients/packages_proposal.ycp new/yast2-update-2.14.1/src/clients/packages_proposal.ycp
--- old/yast2-update-2.14.0/src/clients/packages_proposal.ycp 2006-10-09 15:55:01.000000000 +0200
+++ new/yast2-update-2.14.1/src/clients/packages_proposal.ycp 2006-10-13 13:39:55.000000000 +0200
@@ -4,6 +4,8 @@
* Author: Arvin Schnell
*
* Purpose: Let user choose packages during update.
+ *
+ * $Id: packages_proposal.ycp 33392 2006-10-13 11:39:53Z locilka $
*/
{
textdomain "update";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.14.0/src/clients/rootpart_proposal.ycp new/yast2-update-2.14.1/src/clients/rootpart_proposal.ycp
--- old/yast2-update-2.14.0/src/clients/rootpart_proposal.ycp 2006-10-09 15:55:01.000000000 +0200
+++ new/yast2-update-2.14.1/src/clients/rootpart_proposal.ycp 2006-10-13 13:39:55.000000000 +0200
@@ -4,11 +4,12 @@
* Author: Arvin Schnell
*
* Purpose: Let user choose root partition during update.
+ *
+ * $Id: rootpart_proposal.ycp 33392 2006-10-13 11:39:53Z locilka $
*/
{
textdomain "update";
- import "HTML";
import "Mode";
import "Linuxrc";
import "Update";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.14.0/src/clients/update.ycp new/yast2-update-2.14.1/src/clients/update.ycp
--- old/yast2-update-2.14.0/src/clients/update.ycp 2006-10-09 15:55:01.000000000 +0200
+++ new/yast2-update-2.14.1/src/clients/update.ycp 2006-10-13 13:39:55.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Klaus Kaempf
* Arvin Schnell
*
- * $Id: update.ycp 29558 2006-03-30 12:26:29Z mvidner $
+ * $Id: update.ycp 33392 2006-10-13 11:39:53Z locilka $
*/
{
@@ -20,10 +20,6 @@
import "Mode";
import "Update";
import "Wizard";
- import "Directory";
- import "Report";
- import "Kernel";
- import "GetInstArgs";
import "ProductControl";
// set normal mode and update
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.14.0/src/clients/update_proposal.ycp new/yast2-update-2.14.1/src/clients/update_proposal.ycp
--- old/yast2-update-2.14.0/src/clients/update_proposal.ycp 2006-10-09 17:06:08.000000000 +0200
+++ new/yast2-update-2.14.1/src/clients/update_proposal.ycp 2006-10-13 13:39:55.000000000 +0200
@@ -4,6 +4,8 @@
* Author: Arvin Schnell
*
* Purpose: Let user choose update settings.
+ *
+ * $Id: update_proposal.ycp 33392 2006-10-13 11:39:53Z locilka $
*/
{
textdomain "update";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.14.0/src/modules/RootPart.ycp new/yast2-update-2.14.1/src/modules/RootPart.ycp
--- old/yast2-update-2.14.0/src/modules/RootPart.ycp 2006-10-09 17:08:40.000000000 +0200
+++ new/yast2-update-2.14.1/src/modules/RootPart.ycp 2006-10-13 13:39:55.000000000 +0200
@@ -6,7 +6,7 @@
* Purpose: Responsible for searching of root partitions and
* mounting of target partitions.
*
- * $Id: RootPart.ycp 33289 2006-10-09 15:08:37Z locilka $
+ * $Id: RootPart.ycp 33392 2006-10-13 11:39:53Z locilka $
*/
{
module "RootPart";
@@ -22,8 +22,8 @@
import "ModuleLoading";
import "FileSystems";
import "Update";
- import "Packages";
import "SuSERelease";
+ import "FileUtils";
include "partitioning/partition_defines.ycp";
include "partitioning/custom_part_helptexts.ycp";
@@ -263,9 +263,6 @@
string out = sformat (_("Checking partition %1"), partition);
UI::OpenDialog (`opt(`decorated ), `Label(out));
- // FIXME why is the sleep here?
- sleep (1000);
-
y2milestone ("command: /sbin/e2fsck -y %1", partition);
SCR::Execute (.target.bash, "/sbin/e2fsck -y " + partition);
@@ -341,9 +338,16 @@
mount_type = FileSystems::GetMountString (
Storage::DetectFs (device), "");
- // #167976, was broken with "-t ", modprobe before adding it
- y2milestone("Calling 'modprobe %1'", mount_type);
- SCR::Execute(.target.modprobe, mount_type, "" );
+ list <string> non_modular_fs = [ "proc", "sysfs" ];
+
+ // #211916, sysfs, proc are not modular
+ if (! contains (non_modular_fs, mount_type)) {
+ // #167976, was broken with "-t ", modprobe before adding it
+ y2milestone("Calling 'modprobe %1'", mount_type);
+ SCR::Execute(.target.modprobe, mount_type, "" );
+ } else {
+ y2milestone("FS type %1 is not modular, skipping modprobe...", mount_type);
+ }
string error_message = nil;
if (! RunFSCKonJFS (mount_type, device, error_message)) {
@@ -469,19 +473,17 @@
return fstab;
}
-
/**
- *
+ * Register a new fstab agent and read the configuration
+ * from Installation::destdir
*/
- define boolean read_fstab_and_cryptotab (list <map>& fstab, list <map>& crtab)
- {
- integer default_scr = WFM::SCRGetDefault ();
- integer new_scr = nil;
- if (Stage::initial ())
- {
- SCR::RegisterAgent (.target.etc.fstab, `ag_anyagent(
+ void readFsTab (list <map> & fstab) {
+ string fstab_file = Installation::destdir + "/etc/fstab";
+
+ if (FileUtils::Exists (fstab_file)) {
+ SCR::RegisterAgent (.target.etc.fstab, `ag_anyagent(
`Description (
- (`File(Installation::destdir+"/etc/fstab")),
+ (`File(fstab_file)),
"#\n", // Comment
false, // read-only
(`List (
@@ -502,9 +504,26 @@
))
)
));
- SCR::RegisterAgent (.target.etc.cryptotab, `ag_anyagent(
+
+ fstab = (list<map>) SCR::Read (.target.etc.fstab);
+
+ SCR::UnregisterAgent (.target.etc.fstab);
+ } else {
+ y2error ("No such file %1. Not using fstab.", fstab_file);
+ }
+ }
+
+ /**
+ * Register a new cryptotab agent and read the configuration
+ * from Installation::destdir
+ */
+ void readCryptoTab (list <map> & crtab) {
+ string crtab_file = Installation::destdir + "/etc/cryptotab";
+
+ if (FileUtils::Exists (crtab_file)) {
+ SCR::RegisterAgent (.target.etc.cryptotab, `ag_anyagent(
`Description (
- (`File(Installation::destdir+"/etc/cryptotab")),
+ (`File(crtab_file)),
"#\n", // Comment
false, // read-only
(`List (
@@ -525,10 +544,26 @@
))
)
));
- fstab = (list<map>) SCR::Read (.target.etc.fstab);
- crtab = (list<map>) SCR::Read (.target.etc.cryptotab);
- SCR::UnregisterAgent (.target.etc.fstab);
- SCR::UnregisterAgent (.target.etc.cryptotab);
+
+ crtab = (list<map>) SCR::Read (.target.etc.cryptotab);
+
+ SCR::UnregisterAgent (.target.etc.cryptotab);
+ } else {
+ y2warning ("No such file %1. Not using cryptotab.", crtab_file);
+ }
+ }
+
+ /**
+ *
+ */
+ define boolean read_fstab_and_cryptotab (list <map>& fstab, list <map>& crtab)
+ {
+ integer default_scr = WFM::SCRGetDefault ();
+ integer new_scr = nil;
+ if (Stage::initial ())
+ {
+ readFsTab (fstab);
+ readCryptoTab (crtab);
}
else
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.14.0/src/modules/Update.ycp new/yast2-update-2.14.1/src/modules/Update.ycp
--- old/yast2-update-2.14.0/src/modules/Update.ycp 2006-10-09 17:08:40.000000000 +0200
+++ new/yast2-update-2.14.1/src/modules/Update.ycp 2006-10-13 13:39:55.000000000 +0200
@@ -6,7 +6,7 @@
*
* Purpose: Update module
*
- * $Id: Update.ycp 33289 2006-10-09 15:08:37Z locilka $
+ * $Id: Update.ycp 33392 2006-10-13 11:39:53Z locilka $
*/
{
module "Update";
@@ -189,8 +189,15 @@
{
data["nameandversion"] = data["name"]:"?" + " " + data["version"]:"?";
- list <string> tmp0 = splitstring (data["version"]:"", " -");
- list <string> tmp1 = splitstring (tmp0[0]:"", ".");
+ list <string> tmp0 = [];
+ if (regexpmatch (data["version"]:"", " -")) {
+ splitstring (data["version"]:"", " -");
+ }
+
+ list <string> tmp1 = [];
+ if (regexpmatch (tmp0[0]:"", "\.")) {
+ splitstring (tmp0[0]:"", ".");
+ }
integer tmp2 = tointeger (tmp1[0]:"-1");
if (tmp2 >= 0)
@@ -255,9 +262,9 @@
y2milestone ("First source product %1", new_product);
if (new_product == nil)
{
- y2error ("Screwed source");
updateVersion["name"] = "?";
updateVersion["version"] = "?";
+ y2error("Cannot find out source details: %1", updateVersion);
fill_version_map (updateVersion);
return false;
}
@@ -303,11 +310,11 @@
}
string ReadInstalledDesktop() {
- SCR::Execute (.target.bash, "/bin/mv /etc/sysconfig/windowmanager /etc/sysconfig/windowmanager.old");
+ SCR::Execute (.target.bash, "/bin/mv -f /etc/sysconfig/windowmanager /etc/sysconfig/windowmanager.old");
SCR::Execute (.target.bash, "/bin/ln -s /mnt/etc/sysconfig/windowmanager /etc/sysconfig/windowmanager");
string ret = (string)SCR::Read (.sysconfig.windowmanager.DEFAULT_WM);
- SCR::Execute (.target.bash, "/bin/rm /etc/sysconfig/windowmanager");
- SCR::Execute (.target.bash, "/bin/mv /etc/sysconfig/windowmanager.old /etc/sysconfig/windowmanager");
+ SCR::Execute (.target.bash, "/bin/rm -f /etc/sysconfig/windowmanager");
+ SCR::Execute (.target.bash, "/bin/mv -f /etc/sysconfig/windowmanager.old /etc/sysconfig/windowmanager");
return ret;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org