Hello community,
here is the log from the commit of package yast2-firstboot
checked in at Thu Mar 1 21:05:23 CET 2007.
--------
--- yast2-firstboot/yast2-firstboot.changes 2007-01-05 15:04:37.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yast2-firstboot/yast2-firstboot.changes 2007-02-28 13:41:40.155572000 +0100
@@ -1,0 +2,8 @@
+Wed Feb 28 11:49:25 CET 2007 - lslezak@suse.cz
+
+- Halt the system (configurable in LICENSE_REFUSAL_ACTION) if the
+ firstboot workflow is aborted (prevent from skipping the
+ license agreement) (#247552)
+- 2.15.1
+
+-------------------------------------------------------------------
Old:
----
yast2-firstboot-2.15.0.tar.bz2
New:
----
yast2-firstboot-2.15.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-firstboot.spec ++++++
--- /var/tmp/diff_new_pack.d12438/_old 2007-03-01 21:05:02.000000000 +0100
+++ /var/tmp/diff_new_pack.d12438/_new 2007-03-01 21:05:02.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-firstboot (Version 2.15.0)
+# spec file for package yast2-firstboot (Version 2.15.1)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: yast2-firstboot
URL: http://www.suse.com/
-Version: 2.15.0
+Version: 2.15.1
Release: 1
License: GNU General Public License (GPL), X11/MIT
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-firstboot-2.15.0.tar.bz2
+Source0: yast2-firstboot-2.15.1.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-devtools yast2-network yast2-testsuite yast2-xml
Requires: yast2
@@ -43,7 +43,7 @@
Anas Nashif
%prep
-%setup -n yast2-firstboot-2.15.0
+%setup -n yast2-firstboot-2.15.1
%build
%{prefix}/bin/y2tool y2autoconf
@@ -90,7 +90,12 @@
%doc %{prefix}/share/doc/packages/yast2-firstboot
/etc/YaST2/*.xml
-%changelog -n yast2-firstboot
+%changelog
+* Wed Feb 28 2007 - lslezak@suse.cz
+- Halt the system (configurable in LICENSE_REFUSAL_ACTION) if the
+ firstboot workflow is aborted (prevent from skipping the
+ license agreement) (#247552)
+- 2.15.1
* Fri Jan 05 2007 - jsrain@suse.cz
- add (by-default disabled) re-creation of SSH keys and setting
host name to the firstboot workflow (fate 301246)
++++++ yast2-firstboot-2.15.0.tar.bz2 -> yast2-firstboot-2.15.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firstboot-2.15.0/configure new/yast2-firstboot-2.15.1/configure
--- old/yast2-firstboot-2.15.0/configure 2007-01-05 15:04:10.000000000 +0100
+++ new/yast2-firstboot-2.15.1/configure 2007-02-28 13:40:58.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2-firstboot 2.15.0.
+# Generated by GNU Autoconf 2.60 for yast2-firstboot 2.15.1.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-firstboot'
PACKAGE_TARNAME='yast2-firstboot'
-PACKAGE_VERSION='2.15.0'
-PACKAGE_STRING='yast2-firstboot 2.15.0'
+PACKAGE_VERSION='2.15.1'
+PACKAGE_STRING='yast2-firstboot 2.15.1'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1189,7 +1189,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-firstboot 2.15.0 to adapt to many kinds of systems.
+\`configure' configures yast2-firstboot 2.15.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1260,7 +1260,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-firstboot 2.15.0:";;
+ short | recursive ) echo "Configuration of yast2-firstboot 2.15.1:";;
esac
cat <<\_ACEOF
@@ -1338,7 +1338,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-firstboot configure 2.15.0
+yast2-firstboot configure 2.15.1
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1352,7 +1352,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-firstboot $as_me 2.15.0, which was
+It was created by yast2-firstboot $as_me 2.15.1, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2153,7 +2153,7 @@
# Define the identity of the package.
PACKAGE='yast2-firstboot'
- VERSION='2.15.0'
+ VERSION='2.15.1'
cat >>confdefs.h <<_ACEOF
@@ -2380,7 +2380,7 @@
-VERSION="2.15.0"
+VERSION="2.15.1"
RPMNAME="yast2-firstboot"
MAINTAINER="Jiri Srain "
@@ -3385,7 +3385,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-firstboot $as_me 2.15.0, which was
+This file was extended by yast2-firstboot $as_me 2.15.1, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3428,7 +3428,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-firstboot config.status 2.15.0
+yast2-firstboot config.status 2.15.1
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firstboot-2.15.0/configure.in new/yast2-firstboot-2.15.1/configure.in
--- old/yast2-firstboot-2.15.0/configure.in 2007-01-05 15:04:03.000000000 +0100
+++ new/yast2-firstboot-2.15.1/configure.in 2007-02-28 13:40:53.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-firstboot, 2.15.0, http://bugs.opensuse.org/, yast2-firstboot)
+AC_INIT(yast2-firstboot, 2.15.1, http://bugs.opensuse.org/, yast2-firstboot)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.15.0"
+VERSION="2.15.1"
RPMNAME="yast2-firstboot"
MAINTAINER="Jiri Srain "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firstboot-2.15.0/firstboot.pot new/yast2-firstboot-2.15.1/firstboot.pot
--- old/yast2-firstboot-2.15.0/firstboot.pot 2005-07-29 08:55:27.000000000 +0200
+++ new/yast2-firstboot-2.15.1/firstboot.pot 1970-01-01 01:00:00.000000000 +0100
@@ -1,194 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-29 08:55+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: LANGUAGE \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: src/Firstboot.ycp:30
-msgid "No Text Available"
-msgstr ""
-
-#: src/firstboot_config.ycp:27
-msgid "Empty"
-msgstr ""
-
-#: src/firstboot_config.ycp:28
-msgid "Enabled"
-msgstr ""
-
-#: src/firstboot_config.ycp:29
-msgid "Disabled"
-msgstr ""
-
-#: src/firstboot_config.ycp:50
-msgid "Help"
-msgstr ""
-
-#: src/firstboot_config.ycp:53
-msgid "First Boot Configuration"
-msgstr ""
-
-#: src/firstboot_config.ycp:55
-msgid "&Up"
-msgstr ""
-
-#: src/firstboot_config.ycp:56
-msgid "D&own"
-msgstr ""
-
-#: src/firstboot_config.ycp:57
-msgid "Enab&le or Disable"
-msgstr ""
-
-#: src/firstboot_config.ycp:63
-msgid "Step"
-msgstr ""
-
-#: src/firstboot_config.ycp:63
-msgid "Label"
-msgstr ""
-
-#: src/firstboot_config.ycp:63
-msgid "Module Name"
-msgstr ""
-
-#: src/firstboot_config.ycp:63
-msgid "Status"
-msgstr ""
-
-#. translators: dialog text
-#: src/firstboot_desktop.ycp:73
-msgid ""
-"Select the desktop environment \n"
-"to use from the list below.\n"
-msgstr ""
-
-#. help text fro desktop dialog
-#: src/firstboot_desktop.ycp:89
-msgid ""
-"<h3>Desktop Selections</h3>\n"
-"<p>This system has more than one desktop environment installed. Select\n"
-"the desktop to enable as the default desktop.</p>\n"
-msgstr ""
-
-#. translators: dialog title
-#: src/firstboot_desktop.ycp:95
-msgid "Select Your Default Desktop"
-msgstr ""
-
-#: src/firstboot_finish.ycp:42
-msgid "&Start YaST Control Center"
-msgstr ""
-
-#. caption for dialog "Congratulation Dialog"
-#: src/firstboot_finish.ycp:46
-msgid "Configuration Completed"
-msgstr ""
-
-#. congratulation text 1/4
-#: src/firstboot_finish.ycp:49
-msgid "<p><b>Congratulations!</b></p>"
-msgstr ""
-
-#. congratulation text 2/4
-#: src/firstboot_finish.ycp:52
-msgid ""
-"<p>The installation of &product; on your machine is complete.\n"
-"After clicking <b>Finish</b>, you can log in to the system.</p>\n"
-msgstr ""
-
-#. congratulation text 3/4
-#. Translators: If there exists a SuSE web-page for your language
-#. change the address accordingly. If in doubt leave the original.
-#: src/firstboot_finish.ycp:59
-msgid "<p>Visit us at www.suse.com.</p>"
-msgstr ""
-
-#. congratulation text 4/4
-#: src/firstboot_finish.ycp:62
-msgid "<p>Have a lot of fun!<br>Your SuSE Development Team</p>"
-msgstr ""
-
-#. help 1/4 for dialog "Congratulation Dialog"
-#: src/firstboot_finish.ycp:81
-msgid "<p>Your system is ready for use.</p>"
-msgstr ""
-
-#. help 2/4 for dialog "Congratulation Dialog"
-#: src/firstboot_finish.ycp:84
-msgid ""
-"<p><b>Finish</b> will close the YaST installation and continue\n"
-"to the login screen.</p>\n"
-msgstr ""
-
-#. help 3/4 for dialog "Congratulation Dialog"
-#: src/firstboot_finish.ycp:89
-msgid ""
-"<p>If you choose the default graphical desktop KDE, you can\n"
-"adjust some KDE settings to your hardware. Also notice\n"
-"our SuSE Welcome Dialog.</p>\n"
-msgstr ""
-
-#. help 4/4 for dialog "Congratulation Dialog"
-#: src/firstboot_finish.ycp:97
-msgid ""
-"<p>If desired, experts can use the full range of SuSE's configuration\n"
-"modules at this time. Check <b>Start YaST Control Center</b> and it will start\n"
-"after <b>Finish</b>. Note: The Control Center does not have a back button to\n"
-"return to this installation sequence.</p>\n"
-msgstr ""
-
-#. popup text
-#: src/firstboot_language.ycp:87
-msgid ""
-"Your language setting has been changed.\n"
-"\n"
-"If necessary, you may want to adapt your keyboard settings to the new\n"
-"language. This is possible either in the YaST2 Control Center or by \n"
-"starting \"yast2 keyboard\" directly."
-msgstr ""
-
-#. progress stages
-#: src/firstboot_write.ycp:20
-msgid "Update configuration"
-msgstr ""
-
-#. progress stages
-#: src/firstboot_write.ycp:22
-msgid "Prepare system for first login"
-msgstr ""
-
-#. progress stages
-#: src/firstboot_write.ycp:28
-msgid "Updating configuration..."
-msgstr ""
-
-#. progress stages
-#: src/firstboot_write.ycp:30
-msgid "Preparing system for first login..."
-msgstr ""
-
-#. Help text for last dialog of base installation
-#: src/firstboot_write.ycp:35
-msgid ""
-"<p>\n"
-"Please wait while the system is being configured.\n"
-"</p>"
-msgstr ""
-
-#. Headline for last dialog of first boot workflow
-#: src/firstboot_write.ycp:44
-msgid "Completing the System Configuration"
-msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firstboot-2.15.0/src/firstboot.ycp new/yast2-firstboot-2.15.1/src/firstboot.ycp
--- old/yast2-firstboot-2.15.0/src/firstboot.ycp 2006-06-02 10:57:53.000000000 +0200
+++ new/yast2-firstboot-2.15.1/src/firstboot.ycp 2007-02-28 13:40:40.000000000 +0100
@@ -1,7 +1,7 @@
/**
* Maintainer: Jiri Srain
*
- * $Id: firstboot.ycp 31281 2006-06-02 08:57:51Z jsrain $
+ * $Id: firstboot.ycp 36560 2007-02-28 12:40:38Z lslezak $
*/
{
textdomain "firstboot";
@@ -12,6 +12,7 @@
import "Wizard";
import "Report";
import "Firstboot";
+ import "Misc";
Wizard::OpenNextBackStepsDialog();
@@ -28,10 +29,39 @@
symbol ret = ProductControl::Run();
+ y2milestone("ProductControl::Run() returned: %1", ret);
Pkg::SourceFinishAll();
Pkg::TargetFinish();
UI::CloseDialog();
+
+ // handle abort
+ if (ret == `abort)
+ {
+ // do the same action as if the license has not been accepted
+ string action = Misc::SysconfigRead(.sysconfig.firstboot.LICENSE_REFUSAL_ACTION, "halt");
+ y2milestone("Firstboot aborted, LICENSE_REFUSAL_ACTION: %1", action);
+
+ if (action == "halt")
+ {
+ y2milestone("Halting the system...");
+ SCR::Execute(.target.bash, "/sbin/halt");
+ }
+ else if (action == "reboot")
+ {
+ y2milestone("Rebooting the system...");
+ SCR::Execute(.target.bash, "/sbin/reboot");
+ }
+ else if (action == "continue")
+ {
+ y2milestone("Finishing Yast...");
+ }
+ else
+ {
+ y2error("Unknown action: %1", action);
+ }
+ }
+
return ret;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firstboot-2.15.0/VERSION new/yast2-firstboot-2.15.1/VERSION
--- old/yast2-firstboot-2.15.0/VERSION 2007-01-05 14:54:19.000000000 +0100
+++ new/yast2-firstboot-2.15.1/VERSION 2007-02-28 11:55:13.000000000 +0100
@@ -1 +1 @@
-2.15.0
+2.15.1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org