Hello community,
here is the log from the commit of package yast2-registration
checked in at Sat Oct 25 11:18:24 CEST 2008.
--------
--- yast2-registration/yast2-registration.changes 2008-10-20 20:07:42.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-registration/yast2-registration.changes 2008-10-24 23:09:46.205391000 +0200
@@ -1,0 +2,7 @@
+Fri Oct 24 23:06:02 CEST 2008 - jdsn@suse.de
+
+- checking if registration runs on xen (bnc#418287)
+- more verbose logging
+- 2.17.9
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-registration-2.17.8.tar.bz2
New:
----
yast2-registration-2.17.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-registration.spec ++++++
--- /var/tmp/diff_new_pack.l13459/_old 2008-10-25 11:18:03.000000000 +0200
+++ /var/tmp/diff_new_pack.l13459/_new 2008-10-25 11:18:03.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-registration (Version 2.17.8)
+# spec file for package yast2-registration (Version 2.17.9)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-registration
-Version: 2.17.8
+Version: 2.17.9
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-registration-2.17.8.tar.bz2
+Source0: yast2-registration-2.17.9.tar.bz2
Prefix: /usr
Requires: yast2 >= 2.17.0
Requires: yast2-packager >= 2.17.0
@@ -51,7 +51,7 @@
J. Daniel Schmidt
%prep
-%setup -n yast2-registration-2.17.8
+%setup -n yast2-registration-2.17.9
%build
%{prefix}/bin/y2tool y2autoconf
@@ -106,8 +106,11 @@
#fillup
/var/adm/fillup-templates/sysconfig.suse_register-yast2-registration
/var/adm/fillup-templates/sysconfig.automatic_online_update-yast2-registration
-
%changelog
+* Sat Oct 25 2008 jdsn@suse.de
+- checking if registration runs on xen (bnc#418287)
+- more verbose logging
+- 2.17.9
* Mon Oct 20 2008 jdsn@suse.de
- activate autorefresh for new services
- remove requires to mozilla-xulrunner (bnc#436900)
++++++ yast2-registration-2.17.8.tar.bz2 -> yast2-registration-2.17.9.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.17.8/configure new/yast2-registration-2.17.9/configure
--- old/yast2-registration-2.17.8/configure 2008-10-20 21:22:57.000000000 +0200
+++ new/yast2-registration-2.17.9/configure 2008-10-24 23:42:04.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-registration 2.17.8.
+# Generated by GNU Autoconf 2.61 for yast2-registration 2.17.9.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-registration'
PACKAGE_TARNAME='yast2-registration'
-PACKAGE_VERSION='2.17.8'
-PACKAGE_STRING='yast2-registration 2.17.8'
+PACKAGE_VERSION='2.17.9'
+PACKAGE_STRING='yast2-registration 2.17.9'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1197,7 +1197,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-registration 2.17.8 to adapt to many kinds of systems.
+\`configure' configures yast2-registration 2.17.9 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1268,7 +1268,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-registration 2.17.8:";;
+ short | recursive ) echo "Configuration of yast2-registration 2.17.9:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-registration configure 2.17.8
+yast2-registration configure 2.17.9
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1360,7 +1360,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-registration $as_me 2.17.8, which was
+It was created by yast2-registration $as_me 2.17.9, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2181,7 +2181,7 @@
# Define the identity of the package.
PACKAGE='yast2-registration'
- VERSION='2.17.8'
+ VERSION='2.17.9'
cat >>confdefs.h <<_ACEOF
@@ -2409,7 +2409,7 @@
-VERSION="2.17.8"
+VERSION="2.17.9"
RPMNAME="yast2-registration"
MAINTAINER="J. Daniel Schmidt "
@@ -3304,7 +3304,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-registration $as_me 2.17.8, which was
+This file was extended by yast2-registration $as_me 2.17.9, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3347,7 +3347,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-registration config.status 2.17.8
+yast2-registration config.status 2.17.9
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.17.8/configure.in new/yast2-registration-2.17.9/configure.in
--- old/yast2-registration-2.17.8/configure.in 2008-10-20 21:22:50.000000000 +0200
+++ new/yast2-registration-2.17.9/configure.in 2008-10-24 23:41:59.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-registration, 2.17.8, http://bugs.opensuse.org/, yast2-registration)
+AC_INIT(yast2-registration, 2.17.9, http://bugs.opensuse.org/, yast2-registration)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.17.8"
+VERSION="2.17.9"
RPMNAME="yast2-registration"
MAINTAINER="J. Daniel Schmidt "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.17.8/registration.pot new/yast2-registration-2.17.9/registration.pot
--- old/yast2-registration-2.17.8/registration.pot 2008-10-17 17:29:41.000000000 +0200
+++ new/yast2-registration-2.17.9/registration.pot 2008-10-22 16:48:26.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-17 17:29+0200\n"
+"POT-Creation-Date: 2008-10-22 16:48+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -171,7 +171,7 @@
msgid "Error: Data received is invalid."
msgstr ""
-#: src/clients/inst_suse_register.ycp:179 src/modules/Register.ycp:1433
+#: src/clients/inst_suse_register.ycp:179 src/modules/Register.ycp:1484
msgid "Error: Could not retrieve data."
msgstr ""
@@ -528,12 +528,12 @@
msgstr ""
#. translators: busy popup while registering the system
-#: src/dialogs/texts.ycp:16 src/modules/Register.ycp:757
+#: src/dialogs/texts.ycp:16 src/modules/Register.ycp:775
msgid "Contacting server..."
msgstr ""
#. translators: Text for a busy-process-indicator while registering the system
-#: src/dialogs/texts.ycp:17 src/modules/Register.ycp:759
+#: src/dialogs/texts.ycp:17 src/modules/Register.ycp:777
msgid "This may take a while"
msgstr ""
@@ -708,96 +708,96 @@
msgstr ""
#. translators: this is a heading for an error message - so no punctuation
-#: src/modules/Register.ycp:381
+#: src/modules/Register.ycp:393
msgid "Could not mount floppy disk"
msgstr ""
#. translators: this is a heading for an error message - so no punctuation
-#: src/modules/Register.ycp:407
+#: src/modules/Register.ycp:419
msgid "Could not read file floppy disk"
msgstr ""
#. translators: this is a heading for an error message - so no punctuation
-#: src/modules/Register.ycp:440
+#: src/modules/Register.ycp:452
msgid "Could find SMT certificate file in local path"
msgstr ""
-#: src/modules/Register.ycp:466
+#: src/modules/Register.ycp:478
msgid "Select SMT certificate file"
msgstr ""
-#: src/modules/Register.ycp:478
+#: src/modules/Register.ycp:490
msgid "Do you really want to cancel and thereby skip the Registration?"
msgstr ""
-#: src/modules/Register.ycp:499
+#: src/modules/Register.ycp:511
msgid "Could not copy certificate file"
msgstr ""
-#: src/modules/Register.ycp:500
+#: src/modules/Register.ycp:512
msgid "Do you want to retry?"
msgstr ""
-#: src/modules/Register.ycp:549
+#: src/modules/Register.ycp:567
msgid "Do you want to trust this certificate?"
msgstr ""
-#: src/modules/Register.ycp:550
+#: src/modules/Register.ycp:568
msgid ""
"This certificate will be used to connect to the SMT server.\n"
"You have to trust this certificate in order to continue with the Registration."
msgstr ""
#. translators: this is certificate context
-#: src/modules/Register.ycp:556
+#: src/modules/Register.ycp:574
msgid "<p><b>Issued For:</b></p>"
msgstr ""
#. translators: this is certificate context
-#: src/modules/Register.ycp:569
+#: src/modules/Register.ycp:587
msgid "<p><b>Subject:</b></p>"
msgstr ""
#. translators: this is certificate context
-#: src/modules/Register.ycp:582
+#: src/modules/Register.ycp:600
msgid "<p><b>Validity:</b></p>"
msgstr ""
#. translators: this is certificate context
-#: src/modules/Register.ycp:585
+#: src/modules/Register.ycp:603
msgid "Valid from: "
msgstr ""
#. translators: this is certificate context
-#: src/modules/Register.ycp:587
+#: src/modules/Register.ycp:605
msgid "Valid to: "
msgstr ""
#. translators: this is certificate context
-#: src/modules/Register.ycp:589
+#: src/modules/Register.ycp:607
msgid "Fingerprint: "
msgstr ""
-#: src/modules/Register.ycp:598
+#: src/modules/Register.ycp:616
msgid "Trust"
msgstr ""
-#: src/modules/Register.ycp:598
+#: src/modules/Register.ycp:616
msgid "Reject"
msgstr ""
-#: src/modules/Register.ycp:620
+#: src/modules/Register.ycp:638
msgid ""
"Installation of the SMT certificates failed.\n"
"Please see the logs for further information."
msgstr ""
-#: src/modules/Register.ycp:923
+#: src/modules/Register.ycp:941
#, ycp-format
msgid "Enabled catalog: %1 (%2)"
msgstr ""
-#: src/modules/Register.ycp:929
+#: src/modules/Register.ycp:947
#, ycp-format
msgid "Disabled catalog: %1 (%2)"
msgstr ""
@@ -812,12 +812,12 @@
msgid "Deleted Source: %1"
msgstr ""
-#: src/modules/Register.ycp:1147
+#: src/modules/Register.ycp:1169
#, ycp-format
msgid "Added Service: %1"
msgstr ""
-#: src/modules/Register.ycp:1200
+#: src/modules/Register.ycp:1233
#, ycp-format
msgid "Deleted Service: %1"
msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.17.8/src/clients/inst_suse_register.ycp new/yast2-registration-2.17.9/src/clients/inst_suse_register.ycp
--- old/yast2-registration-2.17.8/src/clients/inst_suse_register.ycp 2008-10-17 14:29:29.000000000 +0200
+++ new/yast2-registration-2.17.9/src/clients/inst_suse_register.ycp 2008-10-24 23:33:01.000000000 +0200
@@ -49,6 +49,7 @@
CommandLine::Run($["id" : "registration",
"help" : cmdhelp
]);
+ y2milestone("Registration was called with help parameter.");
return `auto;
}
@@ -56,32 +57,20 @@
symbol confRegSrv = Register::configureRegistrationServer();
if (confRegSrv == `conferror || confRegSrv == `notrust || confRegSrv == `silentskip)
{
- y2debug("Registration can not be run due to SMT configuration error.");
+ y2error("Registration can not be run due to SMT configuration error.");
return `auto;
}
// no network - no suse_register
- if (!Mode::normal())
+ if (!Mode::normal() && !Internet::suse_register)
{
- if (!Internet::suse_register)
- {
- Internet::do_you = false;
- return `auto;
- }
- }
-
-
- boolean IAMSLE = ( (integer) SCR::Execute(.target.bash, " [ -e /usr/share/applications/YaST2/customer_center.desktop ] ") == 0 ? true:false );
-
- // error handling - skip if suseRegister is missing
- integer sr_exist = (integer) SCR::Execute(.target.bash, "test -x /usr/bin/suse_register");
- if (sr_exist != 0)
- {
- y2milestone("/usr/bin/suse_register does not exist - skipping registration");
+ y2error("The internet test failed or was skipped. So registration will not run.");
Internet::do_you = false;
return `auto;
}
+ boolean IAMSLE = ( (integer) SCR::Execute(.target.bash, " [ -e /usr/share/applications/YaST2/customer_center.desktop ] ") == 0 ? true:false );
+
// Register::initialize() is mandatory - never remove it
Register::initialize();
@@ -140,11 +129,14 @@
/* strings for success popup */
string nccc_success_msg = _("Your configuration was successful.");
string nccc_success_server_added = _("An update server has been added to your configuration.");
+ nccc_success_server_added = TXT["reposUpdated_old"]:"";
string nccc_error_no_server_added = _("No update server could be added to your configuration.");
string nccc_no_source_changes0 = _("No software repository needed to be changed.");
string nccc_no_source_changes = _("Software repositories did not need to be changed.");
/* caption for details view */
- string success_detail_label =_("New Update Server");
+ string success_detail_label_old = _("New Update Server");
+ string success_detail_label_new = _("Updated software repositories");
+ string success_detail_label = success_detail_label_new;
/* strings for manual interaction popup */
string mi_required = _("Manual Interaction Required");
@@ -424,6 +416,8 @@
// function to display an error message
// and offer a detailled view of the error message
+ y2error("Registration is reporting an error to the user: %1", error_msg_details);
+
UI::OpenDialog(error_message);
UI::SetFocus (`id (`skip ));
symbol retry = nil;
@@ -527,7 +521,10 @@
if ( textmode )
{
cmd_ok = (integer) SCR::Execute(.target.bash, "test -x /usr/bin/w3m") == 0 ? true:false;
- // screen is no longer needed as there is UI::RunInTerminal for textmode programs now (#367719)
+ if ( ! cmd_ok )
+ {
+ y2error("Textmode installation requires w3m for interactive registration. w3m is missing.");
+ }
bcmd = " w3m ";
}
else
@@ -545,10 +542,21 @@
}
}
cmd_ok = (integer) SCR::Execute(.target.bash, "test -x /usr/bin/xulrunner") == 0 ? true:false;
+
+ if ( ! cmd_ok )
+ {
+ y2error("Graphical installation requires Mozilla-xulrunner for interactive registration. Mozilla-xulrunner is missing.");
+ }
+
bcmd = " MOZ_DISABLE_PANGO=1 /usr/bin/xulrunner /usr/share/YaST2/yastbrowser/application.ini -url ";
}
- if (! cmd_ok) return "nobrowser";
+ if (! cmd_ok)
+ {
+ y2error("No browser found for interactive registration.");
+ return "nobrowser";
+ }
+
// add url to browser command
bcmd = bcmd + "'" + url + "'";
@@ -569,24 +577,34 @@
boolean launchBrowser(string url)
{
+ y2milestone("Just about to start a browser for manual interaction in registration.");
// check for valid url
map parsed = URL::Parse(url);
- if ( parsed == $[]) return false;
+ if ( parsed == $[])
+ {
+ y2error("The URL to open in the registration browser has an invalid format: %1", parsed);
+ return false;
+ }
// no rebuild of the url - parser seems to only parse one parameter in URL
string uri = String::FirstChunk(url, "\n"); // (#167225)
// get command to run correct browser and execute it
string command = browser_command(uri);
- if (command == "nobrowser") return false;
+ if (command == "nobrowser")
+ {
+ y2error("Could not find a browser to display the registration website.");
+ return false;
+ }
- y2milestone("launching browser: %1", command);
if (textmode)
{
+ y2milestone("Launching textmode browser with: %1", command);
UI::RunInTerminal(command);
}
else
{
+ y2milestone("Launching graphical borwser with: %1", command);
SCR::Execute(.target.bash, command );
}
@@ -598,6 +616,7 @@
boolean registrationServerSettings()
{
+ y2milestone("Asking the user for custom registration server settings.");
string curRegURL = Register::smt_server;
if (curRegURL == nil) curRegURL = "https://";
string curRegCert = Register::smt_server_cert;
@@ -637,11 +656,11 @@
curRegURL = (string) UI::QueryWidget(`id(`newRegistrationServer), `Value);
curRegCert = (string) UI::QueryWidget(`id(`newRegistrationServerCert), `Value);
- // FIXME TODO
// check urls for sanity
map parsed = URL::Parse(curRegURL);
if (parsed == nil || parsed == $[] || parsed["scheme"]:"" != "https" )
{
+ y2error("The selected registration URL has an invalid format: %1", parsed);
Popup::Message(TXT["urlHasToBeHttps"]:"");
continue;
}
@@ -649,12 +668,12 @@
{
Register::smt_server = curRegURL;
Register::smt_server_cert = curRegCert;
+ y2milestone("New registration server: %1", curRegURL);
+ y2milestone("New registration server CA certificate location: %1", curRegCert);
status=true;
break;
}
-
}
-
}
UI::CloseDialog();
@@ -687,7 +706,7 @@
any ret = nil;
integer SRstatus = nil;
string manual_interaction_overview = "";
-
+ symbol xenType = nil;
/* -------------------------------- PROGRAM LOGIC START ----------------------------------------------------------- */
@@ -715,7 +734,8 @@
Register::submit_hwdata = (boolean) UI::QueryWidget(`id(`hwinfo), `Value);
Register::submit_optional= (boolean) UI::QueryWidget(`id(`optional), `Value);
Register::force_registration = (boolean) UI::QueryWidget(`id(`forcereg), `Value);
- Register::register_regularly = (boolean) UI::QueryWidget(`id(`regularly_run), `Value);
+ if ( IAMSLE )
+ Register::register_regularly = (boolean) UI::QueryWidget(`id(`regularly_run), `Value);
}
else if (ret == `localRegistrationServer)
{
@@ -762,6 +782,60 @@
{
if ( configure_status == true )
{
+ if ( IAMSLE && xenType == nil )
+ {
+ // once checking for XEN (bnc#418287)
+ xenType = Register::xenType();
+
+ if ( xenType == `xen0 )
+ {
+ string installPackage = "xen-tools";
+ if ( ! Package::Installed(installPackage))
+ {
+ y2milestone("Xen dom0 detected. Asking the user if the following packages should be installed: %1", installPackage);
+ Package::InstallMsg(installPackage, _("Xen Dom0 detected. The following package needs to be installed."));
+ }
+ else
+ {
+ y2milestone("All needed packages are already installed: %1", installPackage);
+ }
+ }
+ else if ( xenType == `xenU )
+ {
+ string installPackage = "xen-tools-domU";
+ string removePackage = "xen-tools";
+
+ string xenDomU = _("Xen DomU detected.");
+ string installMsg = xenDomU + "\n" + _("The following package needs to be installed.");
+ string removeMsg = xenDomU + "\n" +
+ sformat(_("To count this installation correctly the package %1 needs to be installed."), installPackage ) +
+ "\n" + _("Therefore the following package needs to be removed first.");
+
+
+ Package::RemoveMsg(removePackage, removeMsg);
+
+ if ( ! Package::Installed(removePackage) )
+ {
+ if ( Package::InstallMsg(installPackage, installMsg ) )
+ { y2milestone("Sucessfully installed: %1", installPackage); }
+ else
+ { y2error("Could not install: %1", installPackage); }
+ }
+ else
+ {
+ y2error("In a Xen DomU package %1 is installed rather than %2. Registration will continue nevertheless.", removePackage, installPackage);
+ Popup::Notify( xenDomU + "\n" +
+ sformat(_("The package %1 should have been installed and %2 removed."), installPackage, removePackage ) +
+ "\n" + _("Registration will continue now although the registration server may miscount this installation.")
+ );
+ }
+ }
+ else if ( xenType == nil )
+ {
+ y2error("Detecting XEN failed. Assuming XEN is disabled. Maybe the registration will not count this machine correctly.");
+ xenType = `unknown;
+ }
+ }
// call suseRegister
SRstatus = Register::suseRegister(nil);
@@ -836,8 +910,8 @@
if (! browserrun )
{
- // information_data = $["exit":"198", "stdout":"", "stderr":"" ];
- // FIXME - can this if clause be removed ??
+ y2error("Registration can not finish with manual interaction because no webbrowser was found.");
+ Popup::Message(no_browser_msg);
mi_loopend = true;
}
@@ -880,7 +954,7 @@
{
string oldMessage = _("Setting up online update source...");
string newMessage = _("Updating software repositories...");
- UI::OpenDialog(`VBox(`Label( oldMessage )));
+ UI::OpenDialog(`VBox(`Label( newMessage )));
// add/delete/change repositories
repoSummary = Register::updateSoftwareRepositories(taskList, true);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.17.8/src/clients/suse_register_auto.ycp new/yast2-registration-2.17.9/src/clients/suse_register_auto.ycp
--- old/yast2-registration-2.17.8/src/clients/suse_register_auto.ycp 2008-04-01 21:09:23.000000000 +0200
+++ new/yast2-registration-2.17.9/src/clients/suse_register_auto.ycp 2008-10-24 17:30:59.000000000 +0200
@@ -112,7 +112,27 @@
map AutoPackages()
{
- return $[ "install":[], "remove":[] ];
+ map retmap = $["install":[], "remove":[]];
+
+ symbol xenType = nil;
+ xenType = Register::xenType();
+
+ if ( xenType == `xen0 )
+ {
+ retmap["install"] = add( retmap["install"]:[], "xen-tools" );
+ }
+ else if ( xenType == `xenU )
+ {
+ retmap["remove"] = add( retmap["remove"]:[], "xen-tools" );
+ retmap["install"] = add( retmap["install"]:[], "xen-tools-domU" );
+ }
+ else
+ {
+ y2milestone("XEN is disabled or could not be detected. No package changes will be applied.");
+ }
+
+ y2milestone("Registration suggests the following package changes: %1", retmap);
+ return retmap;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.17.8/src/dialogs/texts.ycp new/yast2-registration-2.17.9/src/dialogs/texts.ycp
--- old/yast2-registration-2.17.8/src/dialogs/texts.ycp 2008-10-09 16:37:29.000000000 +0200
+++ new/yast2-registration-2.17.9/src/dialogs/texts.ycp 2008-10-24 23:03:04.000000000 +0200
@@ -17,7 +17,9 @@
"mayTakeAWhile" : _("This may take a while"),
"pleaseWait" : _("Please wait..."),
"updatingSoftwareRepos" : _("Updating software repositories"),
- "reposUpdated" : _("The software repositories have been updated.\nFind details in the Software Repositories module."),
+ "reposUpdated_old" : _("The software repositories have been updated.\nFind details in the Software Repositories module."),
+ "reposUpdated" : _("The software repositories have been updated."),
+ "findDetailsInRepoModule" : _("Find details in the Software Repositories module."),
"noReposUpdated" : _("No software repositories have been updated."),
"registrationWasSuccessful" : _("Registration was successful."),
"defaultUpdateRepoRestored" : _("The default update repository has been restored."),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.17.8/src/modules/Register.ycp new/yast2-registration-2.17.9/src/modules/Register.ycp
--- old/yast2-registration-2.17.8/src/modules/Register.ycp 2008-10-20 18:56:49.000000000 +0200
+++ new/yast2-registration-2.17.9/src/modules/Register.ycp 2008-10-24 23:14:33.000000000 +0200
@@ -26,6 +26,7 @@
import "SourceManager";
import "Installation";
import "RegisterCert";
+import "Arch";
// --------------------------------------------------------------
// START: Locally defined data
@@ -232,6 +233,43 @@
}
+/*
+ * setupRegistrationServer()
+ *
+ * write SMT server settings to (FATE #302966)
+ * @return symbol that says if we can perform the registration
+ *
+ */
+global symbol xenType()
+{
+ y2milestone("Checking if this machine is a XEN instance or host.");
+
+ if ( Arch::is_xen() )
+ {
+ y2milestone("XEN enabled. Now detecting type.");
+
+ if ( Arch::is_xen0() )
+ {
+ y2milestone("Detected XEN0.");
+ return `xen0;
+ }
+ else if ( Arch::is_xenU() )
+ {
+ y2milestone("Detected XENU");
+ return `xenU;
+ }
+ }
+ else
+ {
+ y2milestone("XEN is disabled.");
+ return `noXen;
+ }
+
+ y2error("An error occurred while detecting XEN. Assuming: XEN is disabled.");
+ return `unknown;
+}
+
+
/*
* setupRegistrationServer()
@@ -851,8 +889,6 @@
{
read_config();
iamroot = amIroot();
-
- // FIXME: need to test for xen-hypervisor status and install xen-packages
}
@@ -997,8 +1033,8 @@
list<string> summary = [];
list<map> currentSources = Pkg::SourceEditGet();
- // log the sources for debugging purposes - FIXME - to be removed soon
- y2milestone("The current sources are: %1", currentSources);
+ // log the sources for debugging purposes
+ // y2milestone("The current sources are: %1", currentSources);
// outer foreach loop - loop over service names/aliases
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.17.8/VERSION new/yast2-registration-2.17.9/VERSION
--- old/yast2-registration-2.17.8/VERSION 2008-10-20 19:15:15.000000000 +0200
+++ new/yast2-registration-2.17.9/VERSION 2008-10-24 23:05:56.000000000 +0200
@@ -1 +1 @@
-2.17.8
+2.17.9
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org