Mailinglist Archive: opensuse-commit (1828 mails)

< Previous Next >
commit autoyast2
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Mon, 08 Sep 2008 16:37:31 +0200
  • Message-id: <20080908143731.8AC81678162@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package autoyast2
checked in at Mon Sep 8 16:37:31 CEST 2008.


--------
--- autoyast2/autoyast2.changes 2008-09-03 17:07:27.000000000 +0200
+++ /mounts/work_src_done/STABLE/autoyast2/autoyast2.changes 2008-09-08
16:14:57.357972000 +0200
@@ -1,0 +2,12 @@
+Mon Sep 8 13:14:40 CEST 2008 - ug@xxxxxxx
+
+- fix for relurl scripts in second stage
+- 2.17.9
+
+-------------------------------------------------------------------
+Fri Sep 5 11:31:36 CEST 2008 - sschober@xxxxxxx
+
+- changed button placement and lables [bnc#423511]
+- fixed window closing behaviour [bnc#423513]
+
+-------------------------------------------------------------------



Old:
----
autoyast2-2.17.7.tar.bz2

New:
----
autoyast2-2.17.9.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ autoyast2.spec ++++++
--- /var/tmp/diff_new_pack.o12109/_old 2008-09-08 16:37:23.000000000 +0200
+++ /var/tmp/diff_new_pack.o12109/_new 2008-09-08 16:37:23.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package autoyast2 (Version 2.17.7)
+# spec file for package autoyast2 (Version 2.17.9)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -20,12 +20,12 @@
Url: http://www.suse.de/~ug

Name: autoyast2
-Version: 2.17.7
-Release: 3
+Version: 2.17.9
+Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: autoyast2-2.17.7.tar.bz2
+Source0: autoyast2-2.17.9.tar.bz2
Prefix: /usr
BuildRequires: docbook-xsl-stylesheets java2-devel-packages libxslt
perl-XML-Writer pkg-config sgml-skel update-desktop-files xorg-x11-libs
yast2-bootloader yast2-country yast2-devtools yast2-mouse yast2-testsuite
yast2-transfer yast2-update
# API for Disabled Modules (ProductControl)
@@ -61,8 +61,8 @@

%package installation
License: GPL v2 or later
-Version: 2.17.7
-Release: 3
+Version: 2.17.9
+Release: 1
Summary: YaST2 - Auto Installation Modules
Group: System/YaST
# API for Disabled Modules (ProductControl)
@@ -83,7 +83,7 @@
Anas Nashif

%prep
-%setup -n autoyast2-2.17.7
+%setup -n autoyast2-2.17.9

%build
%{prefix}/bin/y2tool y2autoconf
@@ -235,6 +235,12 @@
%dir /var/lib/autoinstall
%dir /var/lib/autoinstall/autoconf
%changelog
+* Mon Sep 08 2008 ug@xxxxxxx
+- fix for relurl scripts in second stage
+- 2.17.9
+* Fri Sep 05 2008 sschober@xxxxxxx
+- changed button placement and lables [bnc#423511]
+- fixed window closing behaviour [bnc#423513]
* Wed Sep 03 2008 ug@xxxxxxx
- cloning of software and partitioning is optional now
- list of modules to clone is sorted now

++++++ autoyast2-2.17.7.tar.bz2 -> autoyast2-2.17.9.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/autoyast2-2.17.7/configure
new/autoyast2-2.17.9/configure
--- old/autoyast2-2.17.7/configure 2008-09-03 17:02:56.000000000 +0200
+++ new/autoyast2-2.17.9/configure 2008-09-08 15:57:36.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for autoyast2 2.17.7.
+# Generated by GNU Autoconf 2.61 for autoyast2 2.17.9.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='autoyast2'
PACKAGE_TARNAME='autoyast2'
-PACKAGE_VERSION='2.17.7'
-PACKAGE_STRING='autoyast2 2.17.7'
+PACKAGE_VERSION='2.17.9'
+PACKAGE_STRING='autoyast2 2.17.9'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'

ac_unique_file="RPMNAME"
@@ -1205,7 +1205,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 2.17.7 to adapt to many kinds of systems.
+\`configure' configures autoyast2 2.17.9 to adapt to many kinds of systems.

Usage: $0 [OPTION]... [VAR=VALUE]...

@@ -1276,7 +1276,7 @@

if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of autoyast2 2.17.7:";;
+ short | recursive ) echo "Configuration of autoyast2 2.17.9:";;
esac
cat <<\_ACEOF

@@ -1354,7 +1354,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-autoyast2 configure 2.17.7
+autoyast2 configure 2.17.9
generated by GNU Autoconf 2.61

Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1368,7 +1368,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 2.17.7, which was
+It was created by autoyast2 $as_me 2.17.9, which was
generated by GNU Autoconf 2.61. Invocation command line was

$ $0 $@
@@ -2189,7 +2189,7 @@

# Define the identity of the package.
PACKAGE='autoyast2'
- VERSION='2.17.7'
+ VERSION='2.17.9'


cat >>confdefs.h <<_ACEOF
@@ -2417,7 +2417,7 @@



-VERSION="2.17.7"
+VERSION="2.17.9"
RPMNAME="autoyast2"
MAINTAINER="Uwe Gansert <ug@xxxxxxx>"

@@ -3430,7 +3430,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 2.17.7, which was
+This file was extended by autoyast2 $as_me 2.17.9, which was
generated by GNU Autoconf 2.61. Invocation command line was

CONFIG_FILES = $CONFIG_FILES
@@ -3473,7 +3473,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-autoyast2 config.status 2.17.7
+autoyast2 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/autoyast2-2.17.7/configure.in
new/autoyast2-2.17.9/configure.in
--- old/autoyast2-2.17.7/configure.in 2008-09-03 17:02:50.000000000 +0200
+++ new/autoyast2-2.17.9/configure.in 2008-09-08 15:57:30.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(autoyast2, 2.17.7, http://bugs.opensuse.org/, autoyast2)
+AC_INIT(autoyast2, 2.17.9, 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="2.17.7"
+VERSION="2.17.9"
RPMNAME="autoyast2"
MAINTAINER="Uwe Gansert <ug@xxxxxxx>"

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/autoyast2-2.17.7/src/clients/software_auto.ycp
new/autoyast2-2.17.9/src/clients/software_auto.ycp
--- old/autoyast2-2.17.7/src/clients/software_auto.ycp 2008-04-03
12:53:07.000000000 +0200
+++ new/autoyast2-2.17.9/src/clients/software_auto.ycp 2008-09-04
14:31:14.000000000 +0200
@@ -4,7 +4,7 @@
* Authors: Anas Nashif (nashif@xxxxxxx)
* Summary: Handle Package selections and packages
*
- * $Id: software_auto.ycp 45985 2008-04-02 14:46:40Z lslezak $
+ * $Id: software_auto.ycp 50664 2008-09-04 12:32:05Z ug $
*/
{

@@ -136,6 +136,9 @@
else if (func == "Import") {
ret = AutoinstSoftware::Import(param);
}
+ else if (func == "Read") {
+ ret = AutoinstSoftware::Read();
+ }
else if (func == "Reset") {
AutoinstSoftware::Import($[]);
ret = $[];
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/autoyast2-2.17.7/src/clients/storage_auto.ycp
new/autoyast2-2.17.9/src/clients/storage_auto.ycp
--- old/autoyast2-2.17.7/src/clients/storage_auto.ycp 2008-06-19
15:00:15.000000000 +0200
+++ new/autoyast2-2.17.9/src/clients/storage_auto.ycp 2008-09-04
14:31:14.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Storage
* Authors: Anas Nashif<nashif@xxxxxxx>
*
- * $Id: storage_auto.ycp 48421 2008-06-19 12:59:11Z ug $
+ * $Id: storage_auto.ycp 50664 2008-09-04 12:32:05Z ug $
*/
{
textdomain "autoinst";
@@ -53,6 +53,9 @@
}
y2milestone("Import: %1",list<map> param );
}
+else if(func == "Read") {
+ ret = AutoinstPartPlan::Read();
+}
/* Create a summary*/
else if(func == "Summary") {
ret = AutoinstPartPlan::Summary();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/autoyast2-2.17.7/src/include/conftree.ycp
new/autoyast2-2.17.9/src/include/conftree.ycp
--- old/autoyast2-2.17.7/src/include/conftree.ycp 2008-09-03
16:59:10.000000000 +0200
+++ new/autoyast2-2.17.9/src/include/conftree.ycp 2008-09-05
11:36:18.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: This module handles the configuration for
auto-installation
* Authors: Anas Nashif <nashif@xxxxxxx>
*
- * $Id: conftree.ycp 50627 2008-09-03 15:00:14Z ug $
+ * $Id: conftree.ycp 50723 2008-09-05 09:36:11Z ug $
*/
{

@@ -96,11 +96,17 @@
Wizard::HideBackButton();
Wizard::HideAbortButton();
return `HBox(
- `PushButton( `id(`configure), "&Configure"),
- `HSpacing(3),
- `PushButton( `id(`read), "&Read"),
- `PushButton( `id(`writeNow), "&Write"),
- `PushButton( `id(`reset), "R&eset")
+ `HSpacing(1),
+ `VBox(
+ `PushButton( `id(`read), "&Clone"),
+ `PushButton( `id(`writeNow), "&Apply to system")
+ ),
+ `HStretch(),
+ `VBox(
+ `PushButton( `id(`configure), "&Edit"),
+ `PushButton( `id(`reset), "Clea&r")
+ ),
+ `HSpacing(1)
);
}

@@ -266,18 +272,8 @@
boolean readModule(string module_name){
map resourceMap = Y2ModuleConfig::ModuleMap[module_name]:$[];
string auto = resourceMap["X-SuSE-YaST-AutoInstClient"]:"";
- if( module_name == "software" ){
- Call::Function("software_auto" , ["Import", AutoinstClone::Software()]);
- Call::Function("software_auto" , ["SetModified"]);
- }
- else if( module_name == "partitioning" ){
- Call::Function("storage_auto" , ["Import",
AutoinstClone::Partitioning()]);
- Call::Function("storage_auto" , ["SetModified"]);
- }
- else{
- Call::Function(auto , ["Read"]);
- Call::Function(auto , ["SetModified"]);
- }
+ Call::Function(auto , ["Read"]);
+ Call::Function(auto , ["SetModified"]);
Profile::prepare = true;
return true;
}
@@ -447,9 +443,6 @@
else if( ret == `modules ){
updateDetails();
}
- else if (ret == `cancel)
- ret = "menu_exit";
-
else if (ret == `configure)
{
currentGroup = getGroup();
@@ -672,7 +665,7 @@
Stage::Set(oldStage);
}
}
- else if (ret == "menu_exit") // EXIT
+ else if (ret == "menu_exit" || `cancel == ret ) // EXIT
{
ret = `menu_exit;
if (Profile::changed)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/autoyast2-2.17.7/src/modules/AutoinstClone.ycp
new/autoyast2-2.17.9/src/modules/AutoinstClone.ycp
--- old/autoyast2-2.17.7/src/modules/AutoinstClone.ycp 2008-09-03
16:59:10.000000000 +0200
+++ new/autoyast2-2.17.9/src/modules/AutoinstClone.ycp 2008-09-04
14:31:14.000000000 +0200
@@ -11,7 +11,7 @@
* Authors:
* Anas Nashif <nashif@xxxxxxx>
*
- * $Id: AutoinstClone.ycp 50627 2008-09-03 15:00:14Z ug $
+ * $Id: AutoinstClone.ycp 50664 2008-09-04 12:32:05Z ug $
*
*
*/
@@ -26,16 +26,11 @@
import "Misc";
import "Storage";
import "AutoinstConfig";
- import "StorageDevices";
- import "Storage";
- import "Partitions";
import "Report";

include "autoinstall/xml.ycp";

global map Profile = $[];
- global list<string> inst = [];
- global map<string,boolean> fulfilled_cache = $[];
integer bytes_per_unit = 0;


@@ -113,310 +108,6 @@
*/


- /**
- * Create a partition plan for the calling client
- * @return list partition plan
- */
- global define list Partitioning()
- {
- Mode::SetMode("normal");
- StorageDevices::InitDone();
- map<string, map> StorageMap = eval(Storage::GetTargetMap());
-
- StorageMap=filter(string d, map p, StorageMap, ``( d != "/dev/evms" &&
size(p["partitions"]:[]) > 0));
- y2milestone("Storagemap %1", StorageMap);
-// list evms_vgs = [];
-
- list drives = maplist(string k, map v, StorageMap, ``{
- list partitions = [];
- list winp = [];
- list no_format_list = [ 65, 6, 222 ];
- list no_create_list = [ 222 ];
- list<integer> usepartitions = [];
- integer cyl_size = v["cyl_size"]:0;
- boolean no_create = false;
- foreach(map pe, v["partitions"]:[], ``{
- if( pe["type"]:`x == `extended )
- continue;
- map new_pe = $[];
- new_pe["create"] = true;
- boolean skipwin = false;
- if (haskey(pe,"enc_type")) {
- new_pe["enc_type"] = pe["enc_type"]:`twofish;
- new_pe["crypt_key"] = "ENTER KEY HERE";
- new_pe["loop_fs"] = true;
- new_pe["crypt_fs"] = true;
- }
- if (haskey(pe,"fsid"))
- {
- integer fsid = pe["fsid"]:131;
- list wintypes = union(Partitions::fsid_wintypes,
Partitions::fsid_dostypes);
- list allwin = union(wintypes, Partitions::fsid_ntfstypes);
- if (contains(allwin, fsid) &&
(!issubstring(pe["mount"]:"", "/boot") && !pe["boot"]:false) )
-// if (contains(allwin, fsid) && !
issubstring(pe["mount"]:"", "/boot") )
- {
- y2debug("Windows partitions found: %1", fsid );
- winp = add(winp, pe["nr"]:0);
- skipwin = true;
- if( size(partitions) > 0 ) {
- no_create = true;
- }
- }
- if( contains(allwin, fsid) && issubstring(pe["mount"]:"",
"/boot") ) {
- new_pe["partition_id"] = 259;
- } else {
- new_pe["partition_id"] = pe["fsid"]:131;
- }
- if( contains( no_format_list, pe["fsid"]:0 ) )
- new_pe["format"] = false;
- if( contains( no_create_list, pe["fsid"]:0 ) )
- new_pe["create"] = false;
- }
- if( haskey(pe,"type") && pe["type"]:`x == `primary ) {
- new_pe["partition_type"] = "primary"; // can we always
copy that element?
- }
- if (haskey(pe,"region") && new_pe["create"]:true == true )
- {
- // don't clone the exact region.
- // I don't see any benefit in cloning that strict.
- //new_pe["region"] = pe["region"]:[];
-// new_pe["size"] = sformat("%1", pe["size_k"]:0*1024);
- new_pe["size"] = sformat("%1",
pe["size_k"]:0*1024-cyl_size); // one cylinder buffer for #262535
- if( new_pe["size"]:0 < cyl_size ) // bnc#415005
- new_pe["size"] = cyl_size;
- }
- if (haskey(pe,"label")) {
- new_pe["label"] = pe["label"]:"";
- }
- if (haskey(pe,"mountby")) {
- new_pe["mountby"] = pe["mountby"]:`nomb;
- }
- // LVM Group
- if (haskey(pe,"used_by_type") && pe["used_by_type"]:`nothing
== `UB_LVM)
- {
- new_pe["lvm_group"] = pe["used_by"]:"";
- }
-
- // LV
- if (pe["type"]:`unknown == `lvm )
- {
- new_pe["lv_name"] = pe["name"]:"";
- new_pe["size"] = sformat("%1", pe["size_k"]:0*1024);
- }
- if (haskey(pe,"used_by_type") && pe["used_by_type"]:`nothing
== `UB_MD)
- {
- new_pe["raid_name"] = "/dev/"+pe["used_by"]:"";
- }
-
- // Used Filesystem
- // Raid devices get the filesystem lying on them as
- // detected_fs!
- if (haskey(pe,"used_fs") && pe["fsid"]:0 != 253)
- {
- new_pe["filesystem"] = pe["used_fs"]:`reiser;
- new_pe["format"] = new_pe["format"]:pe["format"]:true;
- }
-
- if (haskey(pe,"nr") && pe["type"]:`unknown != `lvm)
- {
- if (!skipwin)
- {
- y2debug("Adding partition to be used: %1",
pe["nr"]:0);
- usepartitions = add(usepartitions, pe["nr"]:0);
- }
- new_pe["partition_nr"] = pe["nr"]:0;
- }
- if (pe["mount"]:"" != "")
- {
- new_pe["mount"] = pe["mount"]:"";
- }
- if (k == "/dev/md")
- {
- map raid_options = $[];
- raid_options["persistent_superblock"] =
- pe["persistent_superblock"]:false;
- raid_options["raid_type"] = pe["raid_type"]:"raid0";
- new_pe["raid_options"] = raid_options;
- }
-
- if (!skipwin && new_pe["partition_id"]:0 != 15 ) {
- partitions=add(partitions,new_pe);
- }
- });
-
-
- // don't create partitions that are between windows partitions
- // they must exist
- map drive = $[];
- if( no_create ) {
- partitions = maplist( map m, (list<map>)partitions, {
- m["create"] = false;
- return m;
- });
- }
- drive["partitions"] = partitions;
- drive["device"] = k;
- if( v["type"]:`CT_UNKNOWN==`CT_LVM)
- {
- drive["pesize"] = sformat("%1M", v["pesize"]:1 / (1024*1024) );
- drive["type"] = `CT_LVM;
- }
- if (haskey(v,"lvm2") && v["lvm2"]:false)
- {
- drive["lvm2"] = true;
- }
-
- if (size(partitions) > 0 )
- {
- if (size(winp) == 0 )
- {
- drive["use"] = "all";
- }
- else
- {
- list<string> up = [];
- foreach(integer i, usepartitions, ``{
- up = add (up, sformat("%1", i));
- });
- drive["use"] = mergestring(up, ",");
- }
- }
- return drive;
- });
-// drives = filter( map v, (list<map>)drives, ``{
-// if( ! (contains( evms_vgs, v["device"]:"") && v["type"]:`x ==
`CT_LVM ) )
-// return true;
-// y2milestone("kicking LVM %1 out of the profile because an EVMS
with that name exists",v);
-// return false;
-// });
- /* remove drives with no mountpoint */
- drives = filter( map v, (list<map>)drives, ``{
- boolean keep = false;
- foreach( map p, (list<map>)v["partitions"]:[], ``{
- if( p["mount"]:"" != "" || haskey(p,"lvm_group") ||
haskey(p,"raid_name") ) {
- keep = true;
- break;
- }
- });
- return keep;
- });
-
- Mode::SetMode("autoinst_config");
- return drives;
- }
-
- global define boolean isPatternFulfilled( string p ) {
- boolean ret = true;
- if( haskey( fulfilled_cache, p ) )
- return fulfilled_cache[p]:false;
- list<map<string,any> > all_xpatterns = Pkg::ResolvableDependencies
("", `pattern, "");
-
- foreach( map<string,any> dep, all_xpatterns, ``{
- if( ret == true && dep["name"]:"" == p ) {
- foreach( map<string,string> dep2, dep["dependencies"]:[], ``{
- if( dep2["dep_kind"]:"" == "requires" ) {
- if( dep2["res_kind"]:"" == "package" && !contains(
inst, dep2["name"]:"" ) ) {
- ret = false;
- break;
- } else if( dep2["res_kind"]:"" == "pattern" &&
!isPatternFulfilled( dep2["name"]:"" ) ) {
- ret = false;
- break;
- }
- }
- });
- }
- });
- fulfilled_cache[p] = ret;
- return ret;
- }
-
- global define list<string> getPatterns() {
- list<string> ret = [];
- list<map<string,any> > all_patterns = Pkg::ResolvableProperties ("",
`pattern, "");
-
- foreach( map<string,any> m, all_patterns, ``{
- if( !contains(ret, m["name"]:"") && isPatternFulfilled(
m["name"]:"" ) )
- ret = add( ret, m["name"]:"" );
- });
- return ret;
- }
-
- /**
- * Return list of software packages of calling client
- * @return map map of installed software package
- * "patterns" -> list<string> addon selections
- * "packages" -> list<string> user selected packages
- * "remove-packages" -> list<string> packages to remove
- */
- global define map<string, any > Software()
- {
-// boolean ret = Pkg::TargetInit("/", false);
- Pkg::TargetInitialize ("/");
- Pkg::TargetLoad();
- Pkg::SourceStartManager (true);
-
- inst = Pkg::GetPackages(`installed, true);
- list<map<string,any> > all_patterns = Pkg::ResolvableProperties ("",
`pattern, "");
- list<map<string,any> > all_xpatterns = Pkg::ResolvableDependencies
("", `pattern, "");
- list<string> patterns = [];
-
- // get all fulfilled patterns
- // way too many will be fulfilled
- // we will clean that up later
- patterns = getPatterns();
-
- Pkg::TargetFinish ();
-
- string tmproot = AutoinstConfig::tmpDir;
- SCR::Execute(.target.mkdir, tmproot + "/rootclone");
- Pkg::TargetInit( tmproot + "/rootclone", true);
- y2debug("SourceStartCache: %1", Pkg::SourceStartCache(false));
-
- Pkg::SourceStartManager(true);
-
- list<string> packages = Pkg::FilterPackages(false, false, true, true);
- Pkg::TargetFinish ();
- // Remove kernel packages
- list<string> userpackages = packages;
- list<string> removepackages = [];
-
- list<string> patternPackages = [];
- list<string> new_p = [];
- foreach( string tmp_pattern, patterns, ``{
- list<map<string,any> > xpattern = filter( map<string,any> p,
all_xpatterns, ``( p["name"]:"" == tmp_pattern ) );
- map<string,any> found = xpattern[0]:$[];
- boolean req = false;
- foreach( map<string,any> d, found["dependencies"]:[], ``{
- if( d["res_kind"]:"" == "package" && d["dep_kind"]:"" ==
"requires" ) {
- patternPackages = add(patternPackages, d["name"]:"");
- req = true;
- }
- });
- // workaround for our pattern design
- if( req == true )
- new_p = add( new_p, tmp_pattern );
- });
- patterns = new_p;
-
-
- map<string, any > software = $[];
- if( size(patterns) > 0 ) {
- foreach(string p, inst, ``{
- if (!contains(patternPackages, p))
- userpackages = add( userpackages, p );
- });
- foreach(string p, patternPackages, ``{
- if (!contains(inst,p))
- removepackages = add( removepackages, p );
- });
- }
-
- software["packages"] = sort( filter(string pkg, userpackages, ``(!
regexpmatch(pkg, "kernel-.*") || pkg == "kernel-uml")) );
- software["patterns"] = sort( patterns );
- software["remove-packages"] = sort( removepackages );
- return software;
- }
-

/**
* General options
@@ -567,24 +258,13 @@
if (resource == "")
resource = def_resource;
y2debug("current resource: %1", resource);
- if (contains(additional, resource) &&
- "partitioning" != resource && /* handled below */
- "software" != resource) /* handled below */
+ if (contains(additional, resource) )
{
boolean ret = CommonClone(def_resource, resourceMap);
}

});

- if( contains(additional, "partitioning")){
- Call::Function("storage_auto" , ["Import", Partitioning()]);
- Call::Function("storage_auto" , ["SetModified"]);
- }
-
- if( contains(additional, "software")){
- Call::Function("software_auto" , ["Import", Software()]);
- Call::Function("software_auto" , ["SetModified"]);
- }

Call::Function("general_auto" , ["Import", General()]);
Call::Function("general_auto" , ["SetModified"]);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/autoyast2-2.17.7/src/modules/AutoinstPartPlan.ycp
new/autoyast2-2.17.9/src/modules/AutoinstPartPlan.ycp
--- old/autoyast2-2.17.7/src/modules/AutoinstPartPlan.ycp 2008-06-19
15:00:16.000000000 +0200
+++ new/autoyast2-2.17.9/src/modules/AutoinstPartPlan.ycp 2008-09-04
14:31:14.000000000 +0200
@@ -19,6 +19,10 @@
import "AutoinstPartition";
import "Summary";
import "Popup";
+ import "Mode";
+ import "StorageDevices";
+ import "Storage";
+ import "Partitions";


/**
@@ -343,6 +347,200 @@
}
}

+
+ /**
+ * Create a partition plan for the calling client
+ * @return list partition plan
+ */
+ define list ReadHelper()
+ {
+ Mode::SetMode("normal");
+ StorageDevices::InitDone();
+ map<string, map> StorageMap = eval(Storage::GetTargetMap());
+
+ StorageMap=filter(string d, map p, StorageMap, ``( d != "/dev/evms" &&
size(p["partitions"]:[]) > 0));
+ y2milestone("Storagemap %1", StorageMap);
+// list evms_vgs = [];
+
+ list drives = maplist(string k, map v, StorageMap, ``{
+ list partitions = [];
+ list winp = [];
+ list no_format_list = [ 65, 6, 222 ];
+ list no_create_list = [ 222 ];
+ list<integer> usepartitions = [];
+ integer cyl_size = v["cyl_size"]:0;
+ boolean no_create = false;
+ foreach(map pe, v["partitions"]:[], ``{
+ if( pe["type"]:`x == `extended )
+ continue;
+ map new_pe = $[];
+ new_pe["create"] = true;
+ boolean skipwin = false;
+ if (haskey(pe,"enc_type")) {
+ new_pe["enc_type"] = pe["enc_type"]:`twofish;
+ new_pe["crypt_key"] = "ENTER KEY HERE";
+ new_pe["loop_fs"] = true;
+ new_pe["crypt_fs"] = true;
+ }
+ if (haskey(pe,"fsid"))
+ {
+ integer fsid = pe["fsid"]:131;
+ list wintypes = union(Partitions::fsid_wintypes,
Partitions::fsid_dostypes);
+ list allwin = union(wintypes, Partitions::fsid_ntfstypes);
+ if (contains(allwin, fsid) &&
(!issubstring(pe["mount"]:"", "/boot") && !pe["boot"]:false) )
+// if (contains(allwin, fsid) && !
issubstring(pe["mount"]:"", "/boot") )
+ {
+ y2debug("Windows partitions found: %1", fsid );
+ winp = add(winp, pe["nr"]:0);
+ skipwin = true;
+ if( size(partitions) > 0 ) {
+ no_create = true;
+ }
+ }
+ if( contains(allwin, fsid) && issubstring(pe["mount"]:"",
"/boot") ) {
+ new_pe["partition_id"] = 259;
+ } else {
+ new_pe["partition_id"] = pe["fsid"]:131;
+ }
+ if( contains( no_format_list, pe["fsid"]:0 ) )
+ new_pe["format"] = false;
+ if( contains( no_create_list, pe["fsid"]:0 ) )
+ new_pe["create"] = false;
+ }
+ if( haskey(pe,"type") && pe["type"]:`x == `primary ) {
+ new_pe["partition_type"] = "primary"; // can we always
copy that element?
+ }
+ if (haskey(pe,"region") && new_pe["create"]:true == true )
+ {
+ // don't clone the exact region.
+ // I don't see any benefit in cloning that strict.
+ //new_pe["region"] = pe["region"]:[];
+// new_pe["size"] = sformat("%1", pe["size_k"]:0*1024);
+ new_pe["size"] = sformat("%1",
pe["size_k"]:0*1024-cyl_size); // one cylinder buffer for #262535
+ if( new_pe["size"]:0 < cyl_size ) // bnc#415005
+ new_pe["size"] = cyl_size;
+ }
+ if (haskey(pe,"label")) {
+ new_pe["label"] = pe["label"]:"";
+ }
+ if (haskey(pe,"mountby")) {
+ new_pe["mountby"] = pe["mountby"]:`nomb;
+ }
+ // LVM Group
+ if (haskey(pe,"used_by_type") && pe["used_by_type"]:`nothing
== `UB_LVM)
+ {
+ new_pe["lvm_group"] = pe["used_by"]:"";
+ }
+
+ // LV
+ if (pe["type"]:`unknown == `lvm )
+ {
+ new_pe["lv_name"] = pe["name"]:"";
+ new_pe["size"] = sformat("%1", pe["size_k"]:0*1024);
+ }
+ if (haskey(pe,"used_by_type") && pe["used_by_type"]:`nothing
== `UB_MD)
+ {
+ new_pe["raid_name"] = "/dev/"+pe["used_by"]:"";
+ }
+
+ // Used Filesystem
+ // Raid devices get the filesystem lying on them as
+ // detected_fs!
+ if (haskey(pe,"used_fs") && pe["fsid"]:0 != 253)
+ {
+ new_pe["filesystem"] = pe["used_fs"]:`reiser;
+ new_pe["format"] = new_pe["format"]:pe["format"]:true;
+ }
+
+ if (haskey(pe,"nr") && pe["type"]:`unknown != `lvm)
+ {
+ if (!skipwin)
+ {
+ y2debug("Adding partition to be used: %1",
pe["nr"]:0);
+ usepartitions = add(usepartitions, pe["nr"]:0);
+ }
+ new_pe["partition_nr"] = pe["nr"]:0;
+ }
+ if (pe["mount"]:"" != "")
+ {
+ new_pe["mount"] = pe["mount"]:"";
+ }
+ if (k == "/dev/md")
+ {
+ map raid_options = $[];
+ raid_options["persistent_superblock"] =
+ pe["persistent_superblock"]:false;
+ raid_options["raid_type"] = pe["raid_type"]:"raid0";
+ new_pe["raid_options"] = raid_options;
+ }
+
+ if (!skipwin && new_pe["partition_id"]:0 != 15 ) {
+ partitions=add(partitions,new_pe);
+ }
+ });
+
+
+ // don't create partitions that are between windows partitions
+ // they must exist
+ map drive = $[];
+ if( no_create ) {
+ partitions = maplist( map m, (list<map>)partitions, {
+ m["create"] = false;
+ return m;
+ });
+ }
+ drive["partitions"] = partitions;
+ drive["device"] = k;
+ if( v["type"]:`CT_UNKNOWN==`CT_LVM)
+ {
+ drive["pesize"] = sformat("%1M", v["pesize"]:1 / (1024*1024) );
+ drive["type"] = `CT_LVM;
+ }
+ if (haskey(v,"lvm2") && v["lvm2"]:false)
+ {
+ drive["lvm2"] = true;
+ }
+
+ if (size(partitions) > 0 )
+ {
+ if (size(winp) == 0 )
+ {
+ drive["use"] = "all";
+ }
+ else
+ {
+ list<string> up = [];
+ foreach(integer i, usepartitions, ``{
+ up = add (up, sformat("%1", i));
+ });
+ drive["use"] = mergestring(up, ",");
+ }
+ }
+ return drive;
+ });
+// drives = filter( map v, (list<map>)drives, ``{
+// if( ! (contains( evms_vgs, v["device"]:"") && v["type"]:`x ==
`CT_LVM ) )
+// return true;
+// y2milestone("kicking LVM %1 out of the profile because an EVMS
with that name exists",v);
+// return false;
+// });
+ /* remove drives with no mountpoint */
+ drives = filter( map v, (list<map>)drives, ``{
+ boolean keep = false;
+ foreach( map p, (list<map>)v["partitions"]:[], ``{
+ if( p["mount"]:"" != "" || haskey(p,"lvm_group") ||
haskey(p,"raid_name") ) {
+ keep = true;
+ break;
+ }
+ });
+ return keep;
+ });
+
+ Mode::SetMode("autoinst_config");
+ return drives;
+ }
+
+
/**
* PUBLIC INTERFACE
*/
@@ -400,6 +598,10 @@
return true;
}

+ global define boolean Read(){
+ return Import( (list<map>) ReadHelper());
+ }
+
/**
* Dump the settings to a map, for autoinstallation use.
* @return list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/autoyast2-2.17.7/src/modules/AutoinstScripts.ycp
new/autoyast2-2.17.9/src/modules/AutoinstScripts.ycp
--- old/autoyast2-2.17.7/src/modules/AutoinstScripts.ycp 2008-06-17
16:10:04.000000000 +0200
+++ new/autoyast2-2.17.9/src/modules/AutoinstScripts.ycp 2008-09-08
13:15:07.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Custom scripts
* Authors: Anas Nashif <nashif@xxxxxxx>
*
- * $Id: AutoinstScripts.ycp 45201 2008-03-05 09:42:19Z ug $
+ * $Id: AutoinstScripts.ycp 50794 2008-09-08 11:16:42Z ug $
*/

{
@@ -187,7 +187,16 @@
if( issubstring( script["location"]:"", "relurl://" ) ) {
string l = script["location"]:"";
l = substring ( l, 9 );
- string newloc = AutoinstConfig::scheme + "://" +
AutoinstConfig::host + "/" + AutoinstConfig::directory + l;
+ string newloc = "";
+ if( AutoinstConfig::scheme == "relurl" ) {
+ y2milestone("autoyast profile was relurl too");
+ newloc = (string)SCR::Read(.etc.install_inf.ayrelurl);
+ map tok = URL::Parse(newloc);
+ y2milestone("tok = %1", tok);
+ newloc = tok["scheme"]:"" + "://" + tok["host"]:"" + "/" +
dirname(tok["path"]:"") + l;
+ } else {
+ newloc = AutoinstConfig::scheme + "://" +
AutoinstConfig::host + "/" + AutoinstConfig::directory + l;
+ }
script["location"] = newloc;
y2milestone("changed relurl to %1 for script", newloc);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/autoyast2-2.17.7/src/modules/AutoinstSoftware.ycp
new/autoyast2-2.17.9/src/modules/AutoinstSoftware.ycp
--- old/autoyast2-2.17.7/src/modules/AutoinstSoftware.ycp 2008-09-02
17:18:51.000000000 +0200
+++ new/autoyast2-2.17.9/src/modules/AutoinstSoftware.ycp 2008-09-04
14:31:14.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Software
* Authors: Anas Nashif <nashif@xxxxxxx>
*
- * $Id: AutoinstSoftware.ycp 50586 2008-09-02 15:20:04Z ug $
+ * $Id: AutoinstSoftware.ycp 50664 2008-09-04 12:32:05Z ug $
*
*/
{
@@ -16,6 +16,7 @@
import "Stage";
import "SpaceCalculation";
import "Packages";
+ import "Popup";
import "Report";
import "Kernel";
import "AutoinstConfig";
@@ -49,6 +50,9 @@
/* default value of settings modified */
global boolean modified = false;

+ global list<string> inst = [];
+ global map<string,boolean> fulfilled_cache = $[];
+
/**
* Function sets internal variable, which indicates, that any
* settings were modified, to "true"
@@ -259,6 +263,71 @@
}
}

+ if (haskey(Profile::current, "inetd")) {
+ map conf = Profile::current["inetd"]:$[];
+ if (conf["netd_service"]:`none == `xinetd )
+ allpackages = (list<string>) union(allpackages,
+ ["xinetd"]);
+ else
+ allpackages = (list<string>) union(allpackages,
+ ["inetd"]);
+
+ }
+
+ if (haskey(Profile::current, "nis")) {
+ map conf = Profile::current["nis"]:$[];
+ if (conf["start_nis"]:false)
+ allpackages = (list<string>) union(allpackages,
["yast2-nis-client","ypbind"]);
+
+ if (conf["start_autofs"]:false)
+ {
+ string pkg = "autofs4";
+ allpackages = add (allpackages, pkg);
+ }
+ }
+
+ if (haskey(Profile::current, "security")) {
+ allpackages = (list<string>) union(allpackages,
+ ["yast2-security"]);
+ }
+
+ if (haskey(Profile::current, "ldap")) {
+ map ldapclient = Profile::current["ldap"]:$[];
+ if (ldapclient["start_ldap"]:false)
+ allpackages = (list<string>) union(allpackages,
["pam_ldap","nss_ldap"]);
+ if (ldapclient["start_autofs"]:false)
+ {
+ string pkg = "autofs4";
+ allpackages = add (allpackages, pkg);
+ }
+ }
+
+ if (haskey(Profile::current, "nfs_server"))
+ {
+ boolean start_nfsserver = Profile::current["nfs_server",
"start_nfsserver"]:false;
+ if (start_nfsserver)
+ allpackages = (list<string>) union(allpackages,
["yast2-nfs-server", "nfs-kernel-server"]);
+ }
+
+
+ if (haskey(Profile::current, "mail")) {
+ map mail = Profile::current["mail"]:$[];
+ if (mail["mta"]:`other == `postfix)
+ {
+ allpackages = add(allpackages, "postfix");
+ PackageAI::toremove = add(PackageAI::toremove,
"sendmail");
+ if (mail["use_amavis"]:false)
+ allpackages = add(allpackages,
"amavis-postfix");
+ }
+ else if (mail["mta"]:`other == `sendmail)
+ {
+ allpackages = add(allpackages, "sendmail");
+ PackageAI::toremove = add(PackageAI::toremove,
"postfix");
+
+ if (mail["use_amavis"]:false)
+ allpackages = add(allpackages,
"amavis-sendmail");
+ }
+ }
return allpackages;
}

@@ -382,6 +451,123 @@
AutoinstData::post_packages =
(list<string>)toset(union(calcpost,AutoinstData::post_packages));
return;
}
+
+ global define boolean isPatternFulfilled( string p ) {
+ boolean ret = true;
+ if( haskey( fulfilled_cache, p ) )
+ return fulfilled_cache[p]:false;
+ list<map<string,any> > all_xpatterns = Pkg::ResolvableDependencies
("", `pattern, "");
+
+ foreach( map<string,any> dep, all_xpatterns, ``{
+ if( ret == true && dep["name"]:"" == p ) {
+ foreach( map<string,string> dep2, dep["dependencies"]:[], ``{
+ if( dep2["dep_kind"]:"" == "requires" ) {
+ if( dep2["res_kind"]:"" == "package" && !contains(
inst, dep2["name"]:"" ) ) {
+ ret = false;
+ break;
+ } else if( dep2["res_kind"]:"" == "pattern" &&
!isPatternFulfilled( dep2["name"]:"" ) ) {
+ ret = false;
+ break;
+ }
+ }
+ });
+ }
+ });
+ fulfilled_cache[p] = ret;
+ return ret;
+ }
+
+ global define list<string> getPatterns() {
+ list<string> ret = [];
+ list<map<string,any> > all_patterns = Pkg::ResolvableProperties ("",
`pattern, "");
+
+ foreach( map<string,any> m, all_patterns, ``{
+ if( !contains(ret, m["name"]:"") && isPatternFulfilled(
m["name"]:"" ) )
+ ret = add( ret, m["name"]:"" );
+ });
+ return ret;
+ }
+
+
+ /**
+ * Return list of software packages of calling client
+ * @return map map of installed software package
+ * "patterns" -> list<string> addon selections
+ * "packages" -> list<string> user selected packages
+ * "remove-packages" -> list<string> packages to remove
+ */
+ global define map<string, any > ReadHelper()
+ {
+// boolean ret = Pkg::TargetInit("/", false);
+ Pkg::TargetInitialize ("/");
+ Pkg::TargetLoad();
+ Pkg::SourceStartManager (true);
+
+ inst = Pkg::GetPackages(`installed, true);
+ list<map<string,any> > all_patterns = Pkg::ResolvableProperties ("",
`pattern, "");
+ list<map<string,any> > all_xpatterns = Pkg::ResolvableDependencies
("", `pattern, "");
+ list<string> patterns = [];
+
+ // get all fulfilled patterns
+ // way too many will be fulfilled
+ // we will clean that up later
+ patterns = getPatterns();
+
+ Pkg::TargetFinish ();
+
+ string tmproot = AutoinstConfig::tmpDir;
+ SCR::Execute(.target.mkdir, tmproot + "/rootclone");
+ Pkg::TargetInit( tmproot + "/rootclone", true);
+ y2debug("SourceStartCache: %1", Pkg::SourceStartCache(false));
+
+ Pkg::SourceStartManager(true);
+
+ list<string> packages = Pkg::FilterPackages(false, false, true, true);
+ Pkg::TargetFinish ();
+ // Remove kernel packages
+ list<string> userpackages = packages;
+ list<string> removepackages = [];
+
+ list<string> patternPackages = [];
+ list<string> new_p = [];
+ foreach( string tmp_pattern, patterns, ``{
+ list<map<string,any> > xpattern = filter( map<string,any> p,
all_xpatterns, ``( p["name"]:"" == tmp_pattern ) );
+ map<string,any> found = xpattern[0]:$[];
+ boolean req = false;
+ foreach( map<string,any> d, found["dependencies"]:[], ``{
+ if( d["res_kind"]:"" == "package" && d["dep_kind"]:"" ==
"requires" ) {
+ patternPackages = add(patternPackages, d["name"]:"");
+ req = true;
+ }
+ });
+ // workaround for our pattern design
+ if( req == true )
+ new_p = add( new_p, tmp_pattern );
+ });
+ patterns = new_p;
+
+
+ map<string, any > software = $[];
+ if( size(patterns) > 0 ) {
+ foreach(string p, inst, ``{
+ if (!contains(patternPackages, p))
+ userpackages = add( userpackages, p );
+ });
+ foreach(string p, patternPackages, ``{
+ if (!contains(inst,p))
+ removepackages = add( removepackages, p );
+ });
+ }
+
+ software["packages"] = sort( filter(string pkg, userpackages, ``(!
regexpmatch(pkg, "kernel-.*") || pkg == "kernel-uml")) );
+ software["patterns"] = sort( patterns );
+ software["remove-packages"] = sort( removepackages );
+ return software;
+ }
+
+ global define boolean Read(){
+ return Import( ReadHelper() );
+ }

//EOF
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/autoyast2-2.17.7/VERSION new/autoyast2-2.17.9/VERSION
--- old/autoyast2-2.17.7/VERSION 2008-09-02 17:18:41.000000000 +0200
+++ new/autoyast2-2.17.9/VERSION 2008-09-08 15:57:23.000000000 +0200
@@ -1 +1 @@
-2.17.7
+2.17.9


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >