Hello community,
here is the log from the commit of package autoyast2 for openSUSE:Factory checked in at 2013-08-30 11:32:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/autoyast2 (Old)
and /work/SRC/openSUSE:Factory/.autoyast2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "autoyast2"
Changes:
--------
--- /work/SRC/openSUSE:Factory/autoyast2/autoyast2.changes 2013-08-12 11:04:21.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.autoyast2.new/autoyast2.changes 2013-08-30 11:32:43.000000000 +0200
@@ -1,0 +2,18 @@
+Wed Aug 28 16:38:15 CEST 2013 - fehr@suse.de
+
+- make use of rules "totaldisk" and "xserver" work (bnc#836366)
+
+-------------------------------------------------------------------
+Wed Aug 28 11:30:53 CEST 2013 - locilka@suse.com
+
+- version 3.0.3
+- Dropped yast2-mouse support (FATE#313101)
+
+-------------------------------------------------------------------
+Thu Aug 22 16:58:27 CEST 2013 - fehr@suse.de
+
+- version 3.0.2
+- add capability to enable multipathing in profile (fate#316278)
+- put all profile handling before call to inst_system_analysis
+
+-------------------------------------------------------------------
Old:
----
autoyast2-3.0.1.tar.bz2
New:
----
autoyast2-3.0.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ autoyast2.spec ++++++
--- /var/tmp/diff_new_pack.mRpzk9/_old 2013-08-30 11:32:44.000000000 +0200
+++ /var/tmp/diff_new_pack.mRpzk9/_new 2013-08-30 11:32:44.000000000 +0200
@@ -17,7 +17,7 @@
Name: autoyast2
-Version: 3.0.1
+Version: 3.0.3
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -38,7 +38,7 @@
Requires: yast2-core
Requires: yast2-country
Requires: yast2-schema
-Requires: yast2-storage >= 2.19.13
+Requires: yast2-storage >= 3.0.2
Requires: yast2-transfer >= 2.21.0
Requires: yast2-xml
@@ -81,7 +81,6 @@
Requires: yast2-bootloader
Requires: yast2-core
Requires: yast2-country
-Requires: yast2-mouse
Requires: yast2-ncurses
Requires: yast2-packager
Requires: yast2-slp
++++++ autoyast2-3.0.1.tar.bz2 -> autoyast2-3.0.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.0.1/Makefile.am.common new/autoyast2-3.0.3/Makefile.am.common
--- old/autoyast2-3.0.1/Makefile.am.common 2013-08-07 17:46:20.000000000 +0200
+++ new/autoyast2-3.0.3/Makefile.am.common 2013-08-28 16:51:51.000000000 +0200
@@ -15,6 +15,7 @@
CLEANFILES = ${ybcfiles}
DISTCLEANFILES = .dep
+if HAS_YCP_MODULES
# Needs to be outside "." because of cases
# where ycpchook contains a symlink to "."
# Otherwise "." keeps being newer than .dep and we loop.
@@ -26,6 +27,8 @@
${YCPMAKEDEP} --prefix=${prefix} ${YCPCFLAGS} > ${NEWDEP}
cat ${NEWDEP} > .dep
rm ${NEWDEP}
+-include .dep
+endif
dist-hook: check-syntax
@@ -58,4 +61,3 @@
fi; \
fi
--include .dep
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.0.1/VERSION new/autoyast2-3.0.3/VERSION
--- old/autoyast2-3.0.1/VERSION 2013-08-07 11:58:31.000000000 +0200
+++ new/autoyast2-3.0.3/VERSION 2013-08-28 16:41:44.000000000 +0200
@@ -1 +1 @@
-3.0.1
+3.0.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.0.1/autodocs-ycp.ami new/autoyast2-3.0.3/autodocs-ycp.ami
--- old/autoyast2-3.0.1/autodocs-ycp.ami 2013-08-07 17:46:20.000000000 +0200
+++ new/autoyast2-3.0.3/autodocs-ycp.ami 2013-08-28 16:51:51.000000000 +0200
@@ -17,8 +17,11 @@
htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs
+# find all files in Yast/ subdirectory if it exists
+YARD_YAST_FILES = $(shell test -d Yast && find Yast -type f)
+
# use nobase_ prefix to keep the directory structure
-nobase_html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) $(wildcard js/*) $(wildcard css/*) $(wildcard Yast/*)
+nobase_html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) $(wildcard js/*) $(wildcard css/*) $(YARD_YAST_FILES)
CLEANFILES = $(nobase_html_DATA) pod2htm*.tmp
AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.0.1/configure new/autoyast2-3.0.3/configure
--- old/autoyast2-3.0.1/configure 2013-08-07 17:46:23.000000000 +0200
+++ new/autoyast2-3.0.3/configure 2013-08-28 16:51:54.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for autoyast2 3.0.1.
+# Generated by GNU Autoconf 2.69 for autoyast2 3.0.3.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -579,8 +579,8 @@
# Identity of this package.
PACKAGE_NAME='autoyast2'
PACKAGE_TARNAME='autoyast2'
-PACKAGE_VERSION='3.0.1'
-PACKAGE_STRING='autoyast2 3.0.1'
+PACKAGE_VERSION='3.0.3'
+PACKAGE_STRING='autoyast2 3.0.3'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -588,6 +588,8 @@
ac_default_prefix=/usr
ac_subst_vars='LTLIBOBJS
LIBOBJS
+HAS_YCP_MODULES_FALSE
+HAS_YCP_MODULES_TRUE
YCPC
YCPMAKEDEP
YCPDOC
@@ -1247,7 +1249,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 autoyast2 3.0.1 to adapt to many kinds of systems.
+\`configure' configures autoyast2 3.0.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1318,7 +1320,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of autoyast2 3.0.1:";;
+ short | recursive ) echo "Configuration of autoyast2 3.0.3:";;
esac
cat <<\_ACEOF
@@ -1398,7 +1400,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-autoyast2 configure 3.0.1
+autoyast2 configure 3.0.3
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1415,7 +1417,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by autoyast2 $as_me 3.0.1, which was
+It was created by autoyast2 $as_me 3.0.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2354,7 +2356,7 @@
# Define the identity of the package.
PACKAGE='autoyast2'
- VERSION='3.0.1'
+ VERSION='3.0.3'
cat >>confdefs.h <<_ACEOF
@@ -2477,7 +2479,7 @@
-VERSION="3.0.1"
+VERSION="3.0.3"
RPMNAME="autoyast2"
MAINTAINER="Thomas Fehr "
@@ -2845,6 +2847,29 @@
fi
+# handle .dep files in Makefile.am.common if any YCP module is present
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for YCP modules" >&5
+$as_echo_n "checking for YCP modules... " >&6; }
+
+# YCP module file name starts with an upper case letter
+find . -type f | grep -q "[[:upper:]][^/]*\.ycp$" && has_ycp_modules=1
+ if test -n "$has_ycp_modules"; then
+ HAS_YCP_MODULES_TRUE=
+ HAS_YCP_MODULES_FALSE='#'
+else
+ HAS_YCP_MODULES_TRUE='#'
+ HAS_YCP_MODULES_FALSE=
+fi
+
+
+if test -n "$has_ycp_modules"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+$as_echo "found" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+fi
+
ac_config_files="$ac_config_files Makefile agents/Makefile control/Makefile doc/autodocs/Makefile doc/Makefile modconfig/Makefile scripts/Makefile src/Makefile xslt/Makefile"
@@ -3010,6 +3035,10 @@
as_fn_error $? "conditional \"CREATE_PKGCONFIG_NOARCH\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${HAS_YCP_MODULES_TRUE}" && test -z "${HAS_YCP_MODULES_FALSE}"; then
+ as_fn_error $? "conditional \"HAS_YCP_MODULES\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
: "${CONFIG_STATUS=./config.status}"
ac_write_fail=0
@@ -3407,7 +3436,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by autoyast2 $as_me 3.0.1, which was
+This file was extended by autoyast2 $as_me 3.0.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3460,7 +3489,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-autoyast2 config.status 3.0.1
+autoyast2 config.status 3.0.3
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.0.1/configure.ac new/autoyast2-3.0.3/configure.ac
--- old/autoyast2-3.0.1/configure.ac 2013-08-07 17:46:20.000000000 +0200
+++ new/autoyast2-3.0.3/configure.ac 2013-08-28 16:51:51.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.ac for autoyast2
dnl
-dnl -- This file is generated by y2autoconf 3.0.2 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 3.0.4 - DO NOT EDIT! --
dnl (edit configure.ac.in or configure.in.in instead)
-AC_INIT(autoyast2, 3.0.1, http://bugs.opensuse.org/, autoyast2)
+AC_INIT(autoyast2, 3.0.3, http://bugs.opensuse.org/, autoyast2)
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="3.0.1"
+VERSION="3.0.3"
RPMNAME="autoyast2"
MAINTAINER="Thomas Fehr "
@@ -153,6 +153,19 @@
AC_MSG_WARN([yast2-testsuite.rpm is not installed])
])
+# handle .dep files in Makefile.am.common if any YCP module is present
+AC_MSG_CHECKING([for YCP modules])
+
+# YCP module file name starts with an upper case letter
+[find . -type f | grep -q "[[:upper:]][^/]*\.ycp$" && has_ycp_modules=1]
+AM_CONDITIONAL([HAS_YCP_MODULES], [test -n "$has_ycp_modules"])
+
+if test -n "$has_ycp_modules"; then
+ AC_MSG_RESULT([found])
+else
+ AC_MSG_RESULT([not found])
+fi
+
AC_CONFIG_FILES(Makefile agents/Makefile
control/Makefile
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.0.1/control/Makefile.in new/autoyast2-3.0.3/control/Makefile.in
--- old/autoyast2-3.0.1/control/Makefile.in 2013-08-07 17:46:24.000000000 +0200
+++ new/autoyast2-3.0.3/control/Makefile.in 2013-08-28 16:51:55.000000000 +0200
@@ -243,7 +243,7 @@
# Needs to be outside "." because of cases
# where ycpchook contains a symlink to "."
# Otherwise "." keeps being newer than .dep and we loop.
-NEWDEP = ${top_builddir}/.dep.new
+@HAS_YCP_MODULES_TRUE@NEWDEP = ${top_builddir}/.dep.new
CHECK_SYNTAX = true
all: all-am
@@ -494,10 +494,11 @@
# generate dependencies
# two steps not to lose the file if the command fails
# hook: create the links before we look for files
-.dep: $(wildcard *.ycp) ${ycpchook}
- ${YCPMAKEDEP} --prefix=${prefix} ${YCPCFLAGS} > ${NEWDEP}
- cat ${NEWDEP} > .dep
- rm ${NEWDEP}
+@HAS_YCP_MODULES_TRUE@.dep: $(wildcard *.ycp) ${ycpchook}
+@HAS_YCP_MODULES_TRUE@ ${YCPMAKEDEP} --prefix=${prefix} ${YCPCFLAGS} > ${NEWDEP}
+@HAS_YCP_MODULES_TRUE@ cat ${NEWDEP} > .dep
+@HAS_YCP_MODULES_TRUE@ rm ${NEWDEP}
+@HAS_YCP_MODULES_TRUE@-include .dep
dist-hook: check-syntax
check-syntax: $(client_DATA) $(module_DATA) $(ynclude_DATA) $(ydata_DATA) $(ycpchook) $(ybcfiles)
@@ -528,8 +529,6 @@
fi; \
fi
--include .dep
-
# 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.
.NOEXPORT:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.0.1/doc/autodocs/Makefile.in new/autoyast2-3.0.3/doc/autodocs/Makefile.in
--- old/autoyast2-3.0.1/doc/autodocs/Makefile.in 2013-08-07 17:46:24.000000000 +0200
+++ new/autoyast2-3.0.3/doc/autodocs/Makefile.in 2013-08-28 16:51:55.000000000 +0200
@@ -237,8 +237,11 @@
yncludedir = @yncludedir@
ystartupdir = @ystartupdir@
+# find all files in Yast/ subdirectory if it exists
+YARD_YAST_FILES = $(shell test -d Yast && find Yast -type f)
+
# use nobase_ prefix to keep the directory structure
-nobase_html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) $(wildcard js/*) $(wildcard css/*) $(wildcard Yast/*)
+nobase_html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) $(wildcard js/*) $(wildcard css/*) $(YARD_YAST_FILES)
CLEANFILES = $(nobase_html_DATA) pod2htm*.tmp
all: all-am
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.0.1/src/Makefile.in new/autoyast2-3.0.3/src/Makefile.in
--- old/autoyast2-3.0.1/src/Makefile.in 2013-08-07 17:46:24.000000000 +0200
+++ new/autoyast2-3.0.3/src/Makefile.in 2013-08-28 16:51:55.000000000 +0200
@@ -342,7 +342,7 @@
# Needs to be outside "." because of cases
# where ycpchook contains a symlink to "."
# Otherwise "." keeps being newer than .dep and we loop.
-NEWDEP = ${top_builddir}/.dep.new
+@HAS_YCP_MODULES_TRUE@NEWDEP = ${top_builddir}/.dep.new
CHECK_SYNTAX = true
all: all-am
@@ -800,10 +800,11 @@
# generate dependencies
# two steps not to lose the file if the command fails
# hook: create the links before we look for files
-.dep: $(wildcard *.ycp) ${ycpchook}
- ${YCPMAKEDEP} --prefix=${prefix} ${YCPCFLAGS} > ${NEWDEP}
- cat ${NEWDEP} > .dep
- rm ${NEWDEP}
+@HAS_YCP_MODULES_TRUE@.dep: $(wildcard *.ycp) ${ycpchook}
+@HAS_YCP_MODULES_TRUE@ ${YCPMAKEDEP} --prefix=${prefix} ${YCPCFLAGS} > ${NEWDEP}
+@HAS_YCP_MODULES_TRUE@ cat ${NEWDEP} > .dep
+@HAS_YCP_MODULES_TRUE@ rm ${NEWDEP}
+@HAS_YCP_MODULES_TRUE@-include .dep
dist-hook: check-syntax
check-syntax: $(client_DATA) $(module_DATA) $(ynclude_DATA) $(ydata_DATA) $(ycpchook) $(ybcfiles)
@@ -834,8 +835,6 @@
fi; \
fi
--include .dep
-
# 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.
.NOEXPORT:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.0.1/src/autoyast-rnc/general.rnc new/autoyast2-3.0.3/src/autoyast-rnc/general.rnc
--- old/autoyast2-3.0.1/src/autoyast-rnc/general.rnc 2013-07-30 13:01:30.000000000 +0200
+++ new/autoyast2-3.0.3/src/autoyast-rnc/general.rnc 2013-08-22 17:14:56.000000000 +0200
@@ -20,7 +20,8 @@
element proposal { text }*
}? &
element storage {
- element partition_alignment { SYMBOL }?
+ element partition_alignment { SYMBOL }? &
+ element start_multipath { BOOLEAN }?
}? &
element wait {
element pre-modules {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.0.1/src/clients/inst_autoinit.rb new/autoyast2-3.0.3/src/clients/inst_autoinit.rb
--- old/autoyast2-3.0.1/src/clients/inst_autoinit.rb 2013-07-30 13:01:30.000000000 +0200
+++ new/autoyast2-3.0.3/src/clients/inst_autoinit.rb 2013-08-22 17:14:56.000000000 +0200
@@ -17,6 +17,7 @@
Yast.import "Installation"
Yast.import "AutoInstall"
Yast.import "AutoinstConfig"
+ Yast.import "AutoinstGeneral"
Yast.import "ProfileLocation"
Yast.import "AutoInstallRules"
Yast.import "Progress"
@@ -39,15 +40,15 @@
@progress_stages = [
_("Probe hardware"),
_("Retrieve & Read Control File"),
- _("Process Profiles and Rules"),
- _("Parse control file")
+ _("Parse control file"),
+ _("Initial Configuration"),
]
@profileFetched = false
Progress.New(
_("Preparing System for Automatic Installation"),
"", # progress_title
- 7, # progress bar length
+ 6, # progress bar length
@progress_stages,
[],
@help_text
@@ -85,12 +86,9 @@
WFM.CallFunction("inst_iscsi-client", [])
end
+ Progress.NextStep
Progress.Title(_("Probing hardware..."))
-
- if !(Mode.autoupgrade && AutoinstConfig.ProfileInRootPart)
- WFM.CallFunction("inst_system_analysis", [])
- end
- AutoInstallRules.ProbeRules
+ Builtins.y2milestone("Probing hardware...")
if !@profileFetched
# if profile is defined, first read it, then probe hardware
@@ -106,6 +104,13 @@
return @ret if @ret != :ok
end
+ Builtins.sleep(1000)
+ Progress.Finish
+
+ if !(Mode.autoupgrade && AutoinstConfig.ProfileInRootPart)
+ WFM.CallFunction("inst_system_analysis", [])
+ end
+
if Builtins.haskey(Profile.current, "iscsi-client")
Builtins.y2milestone("iscsi-client found")
WFM.CallFunction(
@@ -129,21 +134,15 @@
# AutoInstall::ProcessSpecialResources();
-
- Builtins.sleep(1000)
- Progress.Finish
-
:next
end
def processProfile
Progress.NextStage
- # Initialize Rules
+ Builtins.y2milestone("Starting processProfile msg:%1",AutoinstConfig.message)
Progress.Title(AutoinstConfig.message)
- AutoInstallRules.Init
ret = false
Progress.NextStep
- Progress.Title(_("Processing Profiles and Rules"))
while true
r = ProfileLocation.Process
if r
@@ -171,8 +170,6 @@
return :abort if Popup.ConfirmAbort(:painless) if UI.PollInput == :abort
- Progress.NextStage
-
#
# Set reporting behaviour to default, changed later if required
#
@@ -184,6 +181,7 @@
Progress.NextStage
Progress.Title(_("Parsing control file"))
+ Builtins.y2milestone("Parsing control file")
if !Profile.ReadXML(AutoinstConfig.xml_tmpfile) || Profile.current == {} ||
Profile.current == nil
Popup.Error(
@@ -201,11 +199,15 @@
Progress.NextStage
Progress.Title(_("Initial Configuration"))
- tmp = Ops.get_map(Profile.current, "report", {})
- if !Builtins.haskey(tmp, "yesno_messages")
- Ops.set(tmp, "yesno_messages", Ops.get_map(tmp, "errors", {}))
+ Builtins.y2milestone("Initial Configuration")
+ tmp = Profile.current.fetch("report",{})
+ if !tmp.has_key?( "yesno_messages" )
+ tmp["yesno_messages"] = tmp.fetch("errors",{})
end
Report.Import(tmp)
+ AutoinstGeneral.Import(Profile.current.fetch("general",{}))
+ AutoinstGeneral.SetSignatureHandling
+ AutoinstGeneral.SetMultipathing
#
# Copy the control file for easy access by user to a pre-defined
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.0.1/src/clients/inst_autosetup.rb new/autoyast2-3.0.3/src/clients/inst_autosetup.rb
--- old/autoyast2-3.0.1/src/clients/inst_autosetup.rb 2013-07-30 13:01:30.000000000 +0200
+++ new/autoyast2-3.0.3/src/clients/inst_autosetup.rb 2013-08-28 16:41:44.000000000 +0200
@@ -47,8 +47,8 @@
"<P>Please wait while the system is prepared for autoinstallation.</P>"
)
@progress_stages = [
- _("Configure General Settings "),
_("Execute pre-install user scripts"),
+ _("Configure General Settings "),
_("Set up language"),
_("Create partition plans"),
_("Configure Software selections"),
@@ -57,8 +57,8 @@
]
@progress_descriptions = [
- _("Configuring general settings..."),
_("Executing pre-install user scripts..."),
+ _("Configuring general settings..."),
_("Setting up language..."),
_("Creating partition plans..."),
_("Configuring Software selections..."),
@@ -77,17 +77,8 @@
return :abort if Popup.ConfirmAbort(:painless) if UI.PollInput == :abort
- Progress.NextStage
-
-
- # configure general settings
-
-
-
- return :abort if Popup.ConfirmAbort(:painless) if UI.PollInput == :abort
-
Progress.NextStage
# Pre-Scripts
@@ -100,6 +91,8 @@
return :abort if readModified == :abort
+ return :abort if Popup.ConfirmAbort(:painless) if UI.PollInput == :abort
+
#
# Partitioning and Storage
#//////////////////////////////////////////////////////////////////////
@@ -125,8 +118,11 @@
# reimport scripts, for the case <ask> has changed them
AutoinstScripts.Import(Ops.get_map(Profile.current, "scripts", {}))
#
- # Set Mouse and other workflow variables
+ # Set workflow variables
#
+ Progress.NextStage
+
+ # configure general settings
AutoinstGeneral.Import(Ops.get_map(Profile.current, "general", {}))
Builtins.y2milestone(
"general: %1",
@@ -148,6 +144,7 @@
end
if Builtins.haskey(Profile.current, "add-on")
+ Progress.Title(_("Handling Add-On Products..."))
Call.Function(
"add-on_auto",
["Import", Ops.get_map(Profile.current, "add-on", {})]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.0.1/src/clients/inst_autosetup_upgrade.rb new/autoyast2-3.0.3/src/clients/inst_autosetup_upgrade.rb
--- old/autoyast2-3.0.1/src/clients/inst_autosetup_upgrade.rb 2013-07-30 13:01:30.000000000 +0200
+++ new/autoyast2-3.0.3/src/clients/inst_autosetup_upgrade.rb 2013-08-28 16:41:44.000000000 +0200
@@ -111,7 +111,7 @@
# reimport scripts, for the case <ask> has changed them
AutoinstScripts.Import(Ops.get_map(Profile.current, "scripts", {}))
#
- # Set Mouse and other workflow variables
+ # Set workflow variables
#
AutoinstGeneral.Import(Ops.get_map(Profile.current, "general", {}))
Builtins.y2milestone(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.0.1/src/include/autoinstall/general_dialogs.rb new/autoyast2-3.0.3/src/include/autoinstall/general_dialogs.rb
--- old/autoyast2-3.0.1/src/include/autoinstall/general_dialogs.rb 2013-07-30 13:01:30.000000000 +0200
+++ new/autoyast2-3.0.3/src/include/autoinstall/general_dialogs.rb 2013-08-28 16:41:44.000000000 +0200
@@ -14,16 +14,6 @@
Yast.import "Label"
end
- # Mouse
- # @return [Symbol]
- def MouseDialog
- # create the wizard dialog
- #
- Wizard.CreateDialog
- result = WFM.CallFunction("inst_mouse", [GetInstArgs.Buttons(true, true)])
- Convert.to_symbol(result)
- end
-
# Main dialog
# @return [Symbol]
def ModeDialog
@@ -1085,16 +1075,17 @@
# Dialog for General Settings
# @return [Symbol]
def generalSequence
- dialogs = { "mouse" => lambda { MouseDialog() }, "mode" => lambda do
- ModeDialog()
- end, "ask" => lambda(
- ) do
- askDialog
- end }
+ dialogs = {
+ "mode" => lambda do
+ ModeDialog()
+ end,
+ "ask" => lambda do
+ askDialog
+ end
+ }
sequence = {
- "ws_start" => "mouse",
- "mouse" => { :next => "mode", :abort => :abort },
+ "ws_start" => "mode",
"mode" => { :next => "ask", :abort => :abort },
"ask" => { :next => :finish }
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.0.1/src/modules/AutoInstallRules.rb new/autoyast2-3.0.3/src/modules/AutoInstallRules.rb
--- old/autoyast2-3.0.1/src/modules/AutoInstallRules.rb 2013-07-30 13:01:30.000000000 +0200
+++ new/autoyast2-3.0.3/src/modules/AutoInstallRules.rb 2013-08-28 16:51:45.000000000 +0200
@@ -191,6 +191,7 @@
# Probe all system data to build a set of rules
# @return [void]
def ProbeRules
+ return if @ATTR.size>0
# SMBIOS Data
bios = Convert.to_list(SCR.Read(path(".probe.bios")))
@@ -269,7 +270,6 @@
#
# MAC
#
- @mac = getMAC
Ops.set(@ATTR, "mac", @mac)
#
@@ -285,8 +285,6 @@
#
# Hostid (i.e. a8c00101);
#
- @hostid = getHostid
-
Ops.set(@ATTR, "hostid", @hostid)
Ops.set(@ATTR, "hostname", getHostname)
@@ -389,8 +387,8 @@
@shell = Ops.add(tmpshell, "] ) ")
end
- Builtins.y2debug("var: %1, val: %2", var, val)
- Builtins.y2debug("shell: %1", @shell)
+ Builtins.y2milestone("var: %1, val: %2", var, val)
+ Builtins.y2milestone("shell: %1", @shell)
nil
end
@@ -452,11 +450,19 @@
ismatch = false
go_on = true
+ ProbeRules if !rulelist.empty?
Builtins.foreach(rulelist) do |ruleset|
- Builtins.y2debug("Ruleset: %1", ruleset)
- Builtins.foreach(ruleset) do |rule, ruledef|
- Builtins.y2debug("Rule: %1", rule)
- Builtins.y2debug("Ruledef: %1", ruledef)
+ Builtins.y2milestone("Ruleset: %1", ruleset)
+ rls = ruleset.keys
+ if( rls.include?("result"))
+ rls.reject! {|r| r=="result"}
+ rls.push("result")
+ end
+ Builtins.y2milestone("Orderes Rules: %1", rls)
+ Builtins.foreach(rls) do |rule|
+ ruledef = ruleset.fetch( rule, {} )
+ Builtins.y2milestone("Rule: %1", rule)
+ Builtins.y2milestone("Ruledef: %1", ruledef)
match = Ops.get_string(ruledef, "match", "undefined")
op = Ops.get_string(ruledef, "operator", "and")
matchtype = Ops.get_string(ruledef, "match_type", "exact")
@@ -1097,17 +1103,12 @@
# Constructor
#
def AutoInstallRules
+ @mac = getMAC
+ @hostid = getHostid
nil
end
- # Initialize
- def Init
- ProbeRules() if Stage.initial || Mode.test
-
- nil
- end
-
publish :variable => :userrules, :type => "boolean"
publish :variable => :dontmergeIsDefault, :type => "boolean"
publish :variable => :dontmergeBackup, :type => "list <string>"
@@ -1151,7 +1152,6 @@
publish :function => :CreateDefault, :type => "void ()"
publish :function => :CreateFile, :type => "void (string)"
publish :function => :AutoInstallRules, :type => "void ()"
- publish :function => :Init, :type => "void ()"
end
AutoInstallRules = AutoInstallRulesClass.new
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.0.1/src/modules/AutoinstClone.rb new/autoyast2-3.0.3/src/modules/AutoinstClone.rb
--- old/autoyast2-3.0.1/src/modules/AutoinstClone.rb 2013-07-30 13:01:30.000000000 +0200
+++ new/autoyast2-3.0.3/src/modules/AutoinstClone.rb 2013-08-28 16:41:44.000000000 +0200
@@ -45,59 +45,12 @@
AutoinstClone()
end
- # Constructor
- def AutoinstClone
- #Mode::SetMode ("normal");
- nil
+ # Detects whether the current system uses multipath
+ # @return [Boolean] if in use
+ def multipath_in_use?
+ Storage.GetTargetMap.detect{|k,e| e.fetch("type",:X)==:CT_DMMULTIPATH} ? true:false
end
- # Set root password
-
- # useless
- # define list root() ``{
- # list<map> shadow = (list<map>) SCR::Read(.etc.shadow);
- # map rootacct = (map) filter(map acct, shadow, ``(acct["username"]:"" == "root"))[0]:$[];
- # list users = [];
- # map rootacct_mod = $[];
- # rootacct_mod["user_password"] = rootacct["password"]:"";
- # rootacct_mod["encrypted"] = true;
- # rootacct_mod["username"] = "root";
- # users = add(users, rootacct_mod);
- # return users;
- # }
-
-
- # Find mount points in running system
- # @param string device name
- # @param map partition
- # @param list mount points
- # @return [String]
- # useless
- # define string findMountpoint(string device, map p, list<map> mounts)
- # {
- # string mountPoint = "";
- # foreach(map mount , mounts, ``{
- # string m = sformat("%1%2", device , p["nr"]:nil);
- # if (mount["spec"]:"" == m )
- # {
- # mountPoint = mount["file"]:"";
- # }
- # });
- # return mountPoint;
- # }
-
- # Convert units to size
- # @param list region
- # @return [Fixnum] size
- # useless
- # define integer units_to_size (list region)
- # {
- # integer units = (integer) region[1]:0;
- # return (units * bytes_per_unit) - bytes_per_unit + 1;
- # };
-
-
-
# General options
# @return [Hash] general options
def General
@@ -105,36 +58,26 @@
Mode.SetMode("normal")
general = {}
- mouse = {}
- Ops.set(
- mouse,
- "id",
- Misc.SysconfigRead(path(".sysconfig.mouse.YAST_MOUSE"), "probe")
- )
- Ops.set(general, "mouse", mouse)
- mode = {}
- Ops.set(mode, "confirm", false)
- Ops.set(general, "mode", mode)
-
- Ops.set(
- general,
- "signature-handling",
- {
- "accept_unsigned_file" => true,
- "accept_file_without_checksum" => true,
- "accept_unknown_gpg_key" => true,
- "accept_verification_failed" => false,
- "import_gpg_key" => true,
- "accept_non_trusted_gpg_key" => true
- }
- )
-
- Mode.SetMode("autoinst_config")
- deep_copy(general)
- end
+ general["mode"] = { "confirm" => false }
+ general["signature-handling"] = {
+ "accept_unsigned_file" => true,
+ "accept_file_without_checksum" => true,
+ "accept_unknown_gpg_key" => true,
+ "accept_verification_failed" => false,
+ "import_gpg_key" => true,
+ "accept_non_trusted_gpg_key" => true
+ }
+
+ general["storage"] = {
+ "start_multipath" => multipath_in_use?,
+ "partition_alignment" => Storage.GetPartitionAlignment,
+ }
+ Mode.SetMode("autoinst_config")
+ general
+ end
# Clone a Resource
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.0.1/src/modules/AutoinstGeneral.rb new/autoyast2-3.0.3/src/modules/AutoinstGeneral.rb
--- old/autoyast2-3.0.1/src/modules/AutoinstGeneral.rb 2013-07-30 13:01:30.000000000 +0200
+++ new/autoyast2-3.0.3/src/modules/AutoinstGeneral.rb 2013-08-28 16:41:44.000000000 +0200
@@ -19,7 +19,6 @@
Yast.import "AutoinstConfig"
Yast.import "Summary"
Yast.import "Keyboard"
- Yast.import "Mouse"
Yast.import "Language"
Yast.import "Timezone"
Yast.import "Misc"
@@ -31,8 +30,6 @@
# All shared data are in yast2.rpm to break cyclic dependencies
Yast.import "AutoinstData"
- Yast.include self, "mouse/mouse_raw.rb"
-
#
# Show proposal and ask user for confirmation to go on with auto-installation
# Similar to interactive mode, without letting use change settings
@@ -49,7 +46,7 @@
@askList = []
- # global list<string> proposals = ["bootloader_proposal", "software_proposal", "country_simple_proposal", "timezone_proposal", "users_proposal", "runlevel_proposal", "hwinfo_proposal", "mouse_proposal", "deploying_proposal"];
+ # global list<string> proposals = ["bootloader_proposal", "software_proposal", "country_simple_proposal", "timezone_proposal", "users_proposal", "runlevel_proposal", "hwinfo_proposal", "deploying_proposal"];
@proposals = []
@storage = {}
@@ -78,22 +75,9 @@
def Summary
#string language_name = "";
#string keyboard_name = "";
- mouse_name = ""
- if Ops.get_string(AutoinstData.mouse, "id", "") != "" &&
- Ops.get_string(AutoinstData.mouse, "id", "") != "probe"
- Mouse.Set(Ops.get_string(AutoinstData.mouse, "id", ""))
- mouse_name = Mouse.MakeProposal(false, false)
- else
- mouse_name = _("probe")
- end
- summary = ""
- summary = Summary.AddHeader(summary, _("Mouse"))
- summary = Summary.AddLine(
- summary,
- mouse_name != "" ? mouse_name : Summary.NotConfigured
- )
+ summary = ""
summary = Summary.AddHeader(summary, _("Confirm installation?"))
summary = Summary.AddLine(
@@ -186,7 +170,6 @@
settings = deep_copy(settings)
SetModified()
Builtins.y2milestone("General import: %1", settings)
- AutoinstData.mouse = Ops.get_map(settings, "mouse", {})
@mode = Ops.get_map(settings, "mode", {})
@signature_handling = Ops.get_map(settings, "signature-handling", {})
@askList = Ops.get_list(settings, "ask-list", [])
@@ -202,7 +185,6 @@
def Export
general = {}
- Ops.set(general, "mouse", AutoinstData.mouse)
Ops.set(general, "mode", @mode)
Ops.set(general, "signature-handling", @signature_handling)
Ops.set(general, "ask-list", @askList)
@@ -390,6 +372,14 @@
nil
end
+ # set multipathing
+ # @return [void]
+ def SetMultipathing
+ val = @storage.fetch("start_multipath",false)
+ Builtins.y2milestone("SetMultipathing val:%1", val)
+ Storage.SetMultipathStartup(val)
+ end
+
# Write General Configuration
# @return [Boolean] true on success
def Write
@@ -408,42 +398,14 @@
# see bug #597723. Some machines can't boot with the new alignment that parted uses
# `align_cylinder == old behavior
# `align_optimal == new behavior
- if Builtins.haskey(@storage, "partition_alignment")
- Storage.SetPartitionAlignment(
- Ops.get_symbol(@storage, "partition_alignment", :align_optimal)
- )
- Builtins.y2milestone(
- "alignment set to %1",
- Ops.get_symbol(@storage, "partition_alignment", :align_optimal)
- )
+ if @storage.has_key?("partition_alignment")
+ val = @storage.fetch("partition_alignment",:align_optimal)
+ Storage.SetPartitionAlignment(val)
+ Builtins.y2milestone( "alignment set to %1", val )
end
- #
- # mouse
- #
+ SetMultipathing()
- if Ops.get_string(AutoinstData.mouse, "id", "") != "probe" &&
- Ops.get_string(AutoinstData.mouse, "id", "") != ""
- Mouse.Set(Ops.get_string(AutoinstData.mouse, "id", ""))
- elsif Builtins.haskey(AutoinstData.mouse, "device")
- #
- # Otherwise, try to find the mouse id from the DB using data supplied by user,
- # at least the device is needed.
- #
- device = Ops.get_string(AutoinstData.mouse, "device", "none")
- wheels = Ops.get_integer(AutoinstData.mouse, "wheels", 0)
-
- mice = get_mouse_db
-
- Builtins.foreach(mice) do |f, g|
- data = Ops.get_map(g, 1, {})
- if Ops.get_integer(data, "wheels", 0) == wheels &&
- Ops.get_string(data, "device", "") == device
- Ops.set(AutoinstData.mouse, "id", f)
- end
- end
- Mouse.Set(Ops.get_string(AutoinstData.mouse, "id", ""))
- end
SetSignatureHandling()
nil
@@ -457,10 +419,6 @@
Import(Ops.get_map(Profile.current, "general", {}))
end
SetSignatureHandling()
-
- # FIXME: seriously FIXME! We need a real Read() function
- Storage.InitLibstorage(false)
- Ops.set(@storage, "partition_alignment", Storage.GetPartitionAlignment)
end
nil
end
@@ -470,7 +428,6 @@
publish :variable => :signature_handling, :type => "map"
publish :variable => :askList, :type => "list"
publish :variable => :proposals, :type => "list <string>"
- publish :variable => :storage, :type => "map"
publish :variable => :modified, :type => "boolean"
publish :function => :SetModified, :type => "void ()"
publish :function => :GetModified, :type => "boolean ()"
@@ -478,6 +435,7 @@
publish :function => :Import, :type => "boolean (map)"
publish :function => :Export, :type => "map ()"
publish :function => :SetSignatureHandling, :type => "void ()"
+ publish :function => :SetMultipathing, :type => "void ()"
publish :function => :Write, :type => "boolean ()"
publish :function => :AutoinstGeneral, :type => "void ()"
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.0.1/src/modules/Kickstart.rb new/autoyast2-3.0.3/src/modules/Kickstart.rb
--- old/autoyast2-3.0.1/src/modules/Kickstart.rb 2013-07-30 13:01:30.000000000 +0200
+++ new/autoyast2-3.0.3/src/modules/Kickstart.rb 2013-08-28 16:41:44.000000000 +0200
@@ -140,19 +140,6 @@
Ops.set(general, "keyboard", keyboard)
- # Mouse
- mouse = {}
-
- if Builtins.haskey(@ksConfig, "mouse")
- ks_mouse = Ops.get_map(@ksConfig, "mouse", {})
- Ops.set(mouse, "device", Ops.get_string(ks_mouse, "device", ""))
- Ops.set(mouse, "xemu3", Ops.get_integer(ks_mouse, "emulthree", 0) == 1)
- if Ops.get_string(ks_mouse, "type", "") == "none"
- Ops.set(mouse, "id", "non")
- end
- end
- Ops.set(general, "mouse", mouse)
-
# Clock
clock = {}
if Builtins.haskey(@ksConfig, "timezone")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.0.1/src/modules/Profile.rb new/autoyast2-3.0.3/src/modules/Profile.rb
--- old/autoyast2-3.0.1/src/modules/Profile.rb 2013-07-30 13:01:30.000000000 +0200
+++ new/autoyast2-3.0.3/src/modules/Profile.rb 2013-08-28 16:41:44.000000000 +0200
@@ -604,8 +604,6 @@
Builtins.foreach(general_options) do |k, v|
if k == "keyboard" && Ops.is_string?(v)
old = true
- elsif k == "mouse" && Ops.is_string?(v)
- old = true
elsif k == "encryption_method"
old = true
elsif k == "timezone" && Ops.is_string?(v)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org