Hello community,
here is the log from the commit of package yast2-firstboot for openSUSE:Factory
checked in at Tue Jul 14 23:31:43 CEST 2009.
--------
--- yast2-firstboot/yast2-firstboot.changes 2009-06-18 09:24:18.000000000 +0200
+++ yast2-firstboot/yast2-firstboot.changes 2009-07-14 08:37:08.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Jul 7 10:06:25 CEST 2009 - jsuchome@suse.cz
+
+- added option to do reboot at the end of firstboot (bnc#514745)
+- 2.18.4
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-firstboot-2.18.3.tar.bz2
New:
----
yast2-firstboot-2.18.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-firstboot.spec ++++++
--- /var/tmp/diff_new_pack.Pb1Hq5/_old 2009-07-14 23:30:50.000000000 +0200
+++ /var/tmp/diff_new_pack.Pb1Hq5/_new 2009-07-14 23:30:50.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-firstboot (Version 2.18.3)
+# spec file for package yast2-firstboot (Version 2.18.4)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,13 +19,13 @@
Name: yast2-firstboot
-Version: 2.18.3
+Version: 2.18.4
Release: 1
-License: GPL
-Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-firstboot-2.18.3.tar.bz2
+Source0: yast2-firstboot-2.18.4.tar.bz2
Prefix: /usr
+Group: System/YaST
+License: GPL v2 or later X11/MIT
BuildRequires: docbook-xsl-stylesheets libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-devtools yast2-testsuite yast2-xml
# Internet.ycp moved to yast2.rpm
BuildRequires: yast2 >= 2.16.6
@@ -52,7 +52,7 @@
created to personalize the system.
%prep
-%setup -n yast2-firstboot-2.18.3
+%setup -n yast2-firstboot-2.18.4
%build
%{prefix}/bin/y2tool y2autoconf
@@ -62,7 +62,9 @@
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
%{?suse_update_config:%{suse_update_config -f}}
./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir}
-make %{?jobs:-j%jobs}
+# V=1: verbose build in case we used AM_SILENT_RULES(yes)
+# so that RPM_OPT_FLAGS check works
+make %{?jobs:-j%jobs} V=1
%install
make install DESTDIR="$RPM_BUILD_ROOT"
++++++ yast2-firstboot-2.18.3.tar.bz2 -> yast2-firstboot-2.18.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.18.3/VERSION new/yast2-firstboot-2.18.4/VERSION
--- old/yast2-firstboot-2.18.3/VERSION 2009-06-18 09:23:49.000000000 +0200
+++ new/yast2-firstboot-2.18.4/VERSION 2009-07-07 10:11:07.000000000 +0200
@@ -1 +1 @@
-2.18.3
+2.18.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.18.3/autodocs-ycp.ami new/yast2-firstboot-2.18.4/autodocs-ycp.ami
--- old/yast2-firstboot-2.18.3/autodocs-ycp.ami 2009-06-22 07:45:45.000000000 +0200
+++ new/yast2-firstboot-2.18.4/autodocs-ycp.ami 2009-07-14 08:36:49.000000000 +0200
@@ -1,5 +1,5 @@
# -*- makefile -*- Automake include file
-# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z mvidner $
+# $Id: autodocs-ycp.ami 57644 2009-06-19 08:38:11Z mvidner $
# Builds source documentation for YCP sources
# Uses ycpdoc
@@ -8,20 +8,25 @@
# Optional - the default is $(srcdir)/../../src/*.ycp
# AUTODOCS_PM: Files that the perl autodocs is built from
# Optional - the default is $(srcdir)/../../src/*.pm
+# AUTODOCS_SUBDIR: To install the result to $(docdir)/SUBDIR/autodocs
+# Optional - the default is no subdir, $(docdir)/autodocs
+# AUTODOCS_STRIP: Strip it from filenames. The remaining / are replaced by __
+# Optional - the default is $(srcdir)/../../src
-htmldir = $(docdir)/autodocs
+htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs
-html_DATA = index.html $(wildcard *.html)
+html_DATA = index.html $(filter-out index.html, $(wildcard *.html))
CLEANFILES = $(html_DATA) pod2htm*.tmp
AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp)
AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm)
+AUTODOCS_STRIP ?= $(srcdir)/../../src
index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM)
#including *.pm, for the index
- ${YCPDOC} -d. $^
+ ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP)
for i in $(AUTODOCS_PM); do \
- b=`basename $$i`; b=$${b%.pm}; \
+ b=$${i##$(AUTODOCS_STRIP)}; b=$${b#/}; b=$${b//\//__}; b=$${b%.pm}; \
pod2html --title=$$b --infile=$$i --outfile=$$b.html; \
- echo "<a href='$$b.html'>$$b</a>" > $$b.mod.html; \
+ echo "<a href='$$b.html'>$${b/__/::}</a>" > $$b.mod.html; \
done
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.18.3/configure new/yast2-firstboot-2.18.4/configure
--- old/yast2-firstboot-2.18.3/configure 2009-06-22 07:45:48.000000000 +0200
+++ new/yast2-firstboot-2.18.4/configure 2009-07-14 08:36:55.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for yast2-firstboot 2.18.3.
+# Generated by GNU Autoconf 2.63 for yast2-firstboot 2.18.4.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -596,8 +596,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-firstboot'
PACKAGE_TARNAME='yast2-firstboot'
-PACKAGE_VERSION='2.18.3'
-PACKAGE_STRING='yast2-firstboot 2.18.3'
+PACKAGE_VERSION='2.18.4'
+PACKAGE_STRING='yast2-firstboot 2.18.4'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1282,7 +1282,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.18.3 to adapt to many kinds of systems.
+\`configure' configures yast2-firstboot 2.18.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1353,7 +1353,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-firstboot 2.18.3:";;
+ short | recursive ) echo "Configuration of yast2-firstboot 2.18.4:";;
esac
cat <<\_ACEOF
@@ -1433,7 +1433,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-firstboot configure 2.18.3
+yast2-firstboot configure 2.18.4
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1447,7 +1447,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.18.3, which was
+It was created by yast2-firstboot $as_me 2.18.4, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2294,7 +2294,7 @@
# Define the identity of the package.
PACKAGE='yast2-firstboot'
- VERSION='2.18.3'
+ VERSION='2.18.4'
cat >>confdefs.h <<_ACEOF
@@ -2518,7 +2518,7 @@
-VERSION="2.18.3"
+VERSION="2.18.4"
RPMNAME="yast2-firstboot"
MAINTAINER="Jiri Suchomel "
@@ -3578,7 +3578,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.18.3, which was
+This file was extended by yast2-firstboot $as_me 2.18.4, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3628,7 +3628,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-yast2-firstboot config.status 2.18.3
+yast2-firstboot config.status 2.18.4
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.18.3/configure.in new/yast2-firstboot-2.18.4/configure.in
--- old/yast2-firstboot-2.18.3/configure.in 2009-06-22 07:45:45.000000000 +0200
+++ new/yast2-firstboot-2.18.4/configure.in 2009-07-14 08:36:49.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-firstboot
dnl
-dnl -- This file is generated by y2autoconf 2.18.5 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.18.9 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-firstboot, 2.18.3, http://bugs.opensuse.org/, yast2-firstboot)
+AC_INIT(yast2-firstboot, 2.18.4, http://bugs.opensuse.org/, yast2-firstboot)
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.18.3"
+VERSION="2.18.4"
RPMNAME="yast2-firstboot"
MAINTAINER="Jiri Suchomel "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.18.3/doc/Makefile.am new/yast2-firstboot-2.18.4/doc/Makefile.am
--- old/yast2-firstboot-2.18.3/doc/Makefile.am 2006-11-01 16:12:37.000000000 +0100
+++ new/yast2-firstboot-2.18.4/doc/Makefile.am 2009-06-23 07:26:29.000000000 +0200
@@ -7,7 +7,6 @@
xml_files = $(wildcard *.xml)
html_DATA = $(wildcard html/*.html) \
- html/index.html \
html/yast2docs.css
pdf: firstboot.pdf
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.18.3/doc/Makefile.in new/yast2-firstboot-2.18.4/doc/Makefile.in
--- old/yast2-firstboot-2.18.3/doc/Makefile.in 2009-06-22 07:45:49.000000000 +0200
+++ new/yast2-firstboot-2.18.4/doc/Makefile.in 2009-07-14 08:36:56.000000000 +0200
@@ -194,7 +194,6 @@
SUBDIRS = autodocs
xml_files = $(wildcard *.xml)
html_DATA = $(wildcard html/*.html) \
- html/index.html \
html/yast2docs.css
EXTRA_DIST = $(xml_files)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.18.3/doc/autodocs/Makefile.in new/yast2-firstboot-2.18.4/doc/autodocs/Makefile.in
--- old/yast2-firstboot-2.18.3/doc/autodocs/Makefile.in 2009-06-22 07:45:49.000000000 +0200
+++ new/yast2-firstboot-2.18.4/doc/autodocs/Makefile.in 2009-07-14 08:36:56.000000000 +0200
@@ -17,7 +17,7 @@
# Makefile.am for YCP module .../doc/autodocs
# -*- makefile -*- Automake include file
-# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z mvidner $
+# $Id: autodocs-ycp.ami 57644 2009-06-19 08:38:11Z mvidner $
# Builds source documentation for YCP sources
# Uses ycpdoc
@@ -26,6 +26,10 @@
# Optional - the default is $(srcdir)/../../src/*.ycp
# AUTODOCS_PM: Files that the perl autodocs is built from
# Optional - the default is $(srcdir)/../../src/*.pm
+# AUTODOCS_SUBDIR: To install the result to $(docdir)/SUBDIR/autodocs
+# Optional - the default is no subdir, $(docdir)/autodocs
+# AUTODOCS_STRIP: Strip it from filenames. The remaining / are replaced by __
+# Optional - the default is $(srcdir)/../../src
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
@@ -148,7 +152,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
-htmldir = $(docdir)/autodocs
+htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs
imagedir = @imagedir@
includedir = @includedir@
infodir = @infodir@
@@ -189,7 +193,7 @@
ydatadir = @ydatadir@
yncludedir = @yncludedir@
ystartupdir = @ystartupdir@
-html_DATA = index.html $(wildcard *.html)
+html_DATA = index.html $(filter-out index.html, $(wildcard *.html))
CLEANFILES = $(html_DATA) pod2htm*.tmp
all: all-am
@@ -375,14 +379,15 @@
AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp)
AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm)
+AUTODOCS_STRIP ?= $(srcdir)/../../src
index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM)
#including *.pm, for the index
- ${YCPDOC} -d. $^
+ ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP)
for i in $(AUTODOCS_PM); do \
- b=`basename $$i`; b=$${b%.pm}; \
+ b=$${i##$(AUTODOCS_STRIP)}; b=$${b#/}; b=$${b//\//__}; b=$${b%.pm}; \
pod2html --title=$$b --infile=$$i --outfile=$$b.html; \
- echo "<a href='$$b.html'>$$b</a>" > $$b.mod.html; \
+ echo "<a href='$$b.html'>$${b/__/::}</a>" > $$b.mod.html; \
done
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.18.3/doc/firstboot-section_mod.xml new/yast2-firstboot-2.18.4/doc/firstboot-section_mod.xml
--- old/yast2-firstboot-2.18.3/doc/firstboot-section_mod.xml 2008-08-22 12:12:07.000000000 +0200
+++ new/yast2-firstboot-2.18.4/doc/firstboot-section_mod.xml 2009-07-07 10:09:35.000000000 +0200
@@ -167,6 +167,11 @@
</itemizedlist>
</section>
<section>
+ <title>Reboot at the end</title>
+ <para>It is possible to force reboot at the end of firstboot workflow. To do so, set the value of sysconfig variable FIRSTBOOT_FINISH_ACTION to "reboot".
+ </para>
+ </section>
+ <section>
<title>Release Notes</title>
<para>Use the configuration option FIRSTBOOT_RELEASE_NOTES_PATH to show
release notes in the target language. The value of the option should
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.18.3/scripts/Firstboot-Stage/S09-cleanup new/yast2-firstboot-2.18.4/scripts/Firstboot-Stage/S09-cleanup
--- old/yast2-firstboot-2.18.3/scripts/Firstboot-Stage/S09-cleanup 2009-02-25 19:20:59.000000000 +0100
+++ new/yast2-firstboot-2.18.4/scripts/Firstboot-Stage/S09-cleanup 2009-07-07 10:09:35.000000000 +0200
@@ -48,3 +48,11 @@
fi
stop_unicode
+
+if [ -e "/var/lib/YaST2/firstboot_reboot_after_finish" ] ; then
+ log "\tRebooting system as requested by firstboot..."
+ rm /var/lib/YaST2/firstboot_reboot_after_finish
+ /sbin/reboot
+fi
+
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.18.3/src/Firstboot.ycp new/yast2-firstboot-2.18.4/src/Firstboot.ycp
--- old/yast2-firstboot-2.18.3/src/Firstboot.ycp 2008-07-22 13:13:05.000000000 +0200
+++ new/yast2-firstboot-2.18.4/src/Firstboot.ycp 2009-07-07 10:09:35.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Firstboot settings, input and output functions
* Authors: Anas Nashif
*
- * $Id: Firstboot.ycp 49321 2008-07-22 11:13:05Z jsuchome $
+ * $Id: Firstboot.ycp 57876 2009-07-07 08:09:35Z jsuchome $
*
* Representation of the configuration of firstboot.
* Input and output routines.
@@ -95,7 +95,7 @@
if (script_dir!="")
{
- list<string> scripts = (list<string>)SCR::Read(.target.dir, script_dir);
+ list<string> scripts = sort ((list<string>)SCR::Read(.target.dir, script_dir));
foreach(string script, scripts, ``{
map ret = (map)SCR::Execute(.target.bash_output, script_dir + "/" + script + " >> /var/log/YaST2/firstboot.log");
if (ret["exit"]:-1 != 0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.18.3/src/data/sysconfig.firstboot new/yast2-firstboot-2.18.4/src/data/sysconfig.firstboot
--- old/yast2-firstboot-2.18.3/src/data/sysconfig.firstboot 2008-08-22 12:12:07.000000000 +0200
+++ new/yast2-firstboot-2.18.4/src/data/sysconfig.firstboot 2009-07-07 10:09:35.000000000 +0200
@@ -63,6 +63,12 @@
# What to do if the user did not accept the license
LICENSE_REFUSAL_ACTION="halt"
+## Type: string(reboot)
+## Default: ""
+#
+# Action that should be done after the firstboot sequence finishes.
+FIRSTBOOT_FINISH_ACTION=""
+
## Type: string
## Default: ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.18.3/src/firstboot.ycp new/yast2-firstboot-2.18.4/src/firstboot.ycp
--- old/yast2-firstboot-2.18.3/src/firstboot.ycp 2007-10-23 16:07:20.000000000 +0200
+++ new/yast2-firstboot-2.18.4/src/firstboot.ycp 2009-07-07 10:09:35.000000000 +0200
@@ -1,11 +1,12 @@
/**
* Maintainer: Jiri Srain
*
- * $Id: firstboot.ycp 41529 2007-10-23 14:07:20Z jsrain $
+ * $Id: firstboot.ycp 57876 2009-07-07 08:09:35Z jsuchome $
*/
{
textdomain "firstboot";
+ import "Directory";
import "Mode";
import "Stage";
import "ProductControl";
@@ -38,6 +39,15 @@
Pkg::SourceFinishAll();
Pkg::TargetFinish();
+ if (ret == `next || ret == `finish)
+ {
+ string action = Misc::SysconfigRead(.sysconfig.firstboot.FIRSTBOOT_FINISH_ACTION, "");
+ if (action == "reboot")
+ {
+ SCR::Execute (.target.bash, sformat ("touch %1/firstboot_reboot_after_finish", Directory::vardir));
+ }
+ }
+
UI::CloseDialog();
// handle abort
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org