November 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] <web-client> master : fix script name in comment
by J.Daniel Schmidt 19 Nov '09

19 Nov '09

ref: refs/heads/master commit 8b1eec0258350f17c5cf54df4482b2a514908d0c Author: J. Daniel Schmidt <jdsn(a)suse.de> Date: Thu Nov 19 20:49:49 2009 +0100 fix script name in comment --- webclient/package/check-create-certificate.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/webclient/package/check-create-certificate.pl b/webclient/package/check-create-certificate.pl index 366cee8..e63c328 100755 --- a/webclient/package/check-create-certificate.pl +++ b/webclient/package/check-create-certificate.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -w -# create-ssl-certificate.pl +# check-create-certificate.pl # Check and create a self-signed 2048 bit RSA SSL certificate. # Target issue: non-interactively create a certificate for any kind of a webservice or webserver. # -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <web-client> backgroud_patches_bnc550934 : fix script name in comment
by J.Daniel Schmidt 19 Nov '09

19 Nov '09

ref: refs/heads/backgroud_patches_bnc550934 commit 8b1eec0258350f17c5cf54df4482b2a514908d0c Author: J. Daniel Schmidt <jdsn(a)suse.de> Date: Thu Nov 19 20:49:49 2009 +0100 fix script name in comment --- webclient/package/check-create-certificate.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/webclient/package/check-create-certificate.pl b/webclient/package/check-create-certificate.pl index 366cee8..e63c328 100755 --- a/webclient/package/check-create-certificate.pl +++ b/webclient/package/check-create-certificate.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -w -# create-ssl-certificate.pl +# check-create-certificate.pl # Check and create a self-signed 2048 bit RSA SSL certificate. # Target issue: non-interactively create a certificate for any kind of a webservice or webserver. # -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <web-client> master : check certificate creation script to fix (bnc#550395) needs to be hooked into rcscript
by J.Daniel Schmidt 19 Nov '09

19 Nov '09

ref: refs/heads/master commit 008138110dd541ba72bb8eb5679826259bf1b170 Author: J. Daniel Schmidt <jdsn(a)suse.de> Date: Thu Nov 19 20:46:48 2009 +0100 check certificate creation script to fix (bnc#550395) needs to be hooked into rcscript --- webclient/package/check-create-certificate.pl | 219 +++++++++++++++++++++++++ 1 files changed, 219 insertions(+), 0 deletions(-) diff --git a/webclient/package/check-create-certificate.pl b/webclient/package/check-create-certificate.pl new file mode 100755 index 0000000..366cee8 --- /dev/null +++ b/webclient/package/check-create-certificate.pl @@ -0,0 +1,219 @@ +#!/usr/bin/perl -w + +# create-ssl-certificate.pl +# Check and create a self-signed 2048 bit RSA SSL certificate. +# Target issue: non-interactively create a certificate for any kind of a webservice or webserver. +# +# Author: J. Daniel Schmidt <jdsn(a)suse.de> +# License: GPLv2 +# +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# + + +use strict; +use Getopt::Long qw(:config no_ignore_case);; +use File::Basename; + + +sub usage +{ + print STDERR "\n"; + print STDERR "usage: $0 [--create] [--force] [--path <path>] [--hostname <name>]\n"; + print STDERR " $0 --help\n"; + print STDERR "\n"; + print STDERR " Check for and create a 2048 bit rsa SSL certificate, key file and optionally a combined file.\n"; + print STDERR " Target issue: non-interactively create a certificate for any kind of a webservice or webserver.\n"; + print STDERR "\n"; + print STDERR "Options:\n"; + print STDERR " -c [--create] create certificate unless it exists\n"; + print STDERR " if omitted exitance of certificate files will only be checked\n"; + print STDERR " -f [--force] force to overwrite certificate\n"; + print STDERR " -h [--help] this help\n"; + print STDERR " -H [--hostname] <name> define hostname to use for certificate\n"; + print STDERR " if omitted defaults to 'hostname --fqdn'\n"; + print STDERR " -C [--certfile] <file> define certificate file\n"; + print STDERR " if omitted defaults to /etc/ssl/certs/self-signed-certificate.pem\n"; + print STDERR " -K [--keyfile] <file> define key file\n"; + print STDERR " if omitted defaults to /etc/ssl/private/self-signed-certificate.key\n"; + print STDERR " -B [--combinedfile] <file> define combination file of key and certificate\n"; + print STDERR " will not be created or checked if omitted\n"; + print STDERR "\n"; +} + + +sub create_certificate($$$$) +{ + my $fqdn = shift || return undef; + my $CERTFILE = shift || return undef; + my $KEYFILE = shift || return undef; + my $COMBINEDFILE = shift || undef; + chomp $fqdn; + chomp $CERTFILE; + chomp $KEYFILE; + chomp $COMBINEDFILE if defined $COMBINEDFILE; + + my $config=" +[req] +distinguished_name = user_dn +# x509_extensions = v3_ca +prompt=no + +[user_dn] +commonName = $fqdn +emailAddress = root\@$fqdn +"; + + my $CNF = `mktemp /tmp/create-ssl-config-XXXXX`; + my $CERT = `mktemp /tmp/create-ssl-cert-XXXXX`; + my $KEY = `mktemp /tmp/create-ssl-key-XXXXX`; + chomp $CNF; + chomp $CERT; + chomp $KEY; + if ( not defined $CNF || $CNF =~ /^$/ || + not defined $CERT || $CERT =~ /^$/ || + not defined $KEY || $KEY =~ /^$/ ) + { + print STDERR "Could not create temporary files. Aborting.\n"; + return 0; + } + + my @chmodcmdcnf = ("chmod", "644", "$CNF"); + my @chmodcmdkey = ("chmod", "600", "$KEY"); + my @chmodcmdcert = ("chmod", "644", "$CERT"); + system( @chmodcmdcnf ); + system( @chmodcmdkey ); + system( @chmodcmdcert ); + + open(CONF, ">$CNF"); + print CONF $config; + close CONF; + + my @OPENSSLCMD = ("openssl", "req", "-newkey", "rsa:2048", "-x509", "-nodes", "-days", "1095", "-batch", "-config", "$CNF", "-out", "$CERT", "-keyout", "$KEY"); + if ( system(@OPENSSLCMD) == 0 ) + { + my $COMBINEDPATH = ""; + # copy certificate and key to target location + my @copycert = ("cp", "-a", "$CERT", "$CERTFILE"); + my @copykey = ("cp", "-a", "$KEY", "$KEYFILE"); + system(@copycert); + system(@copykey); + + # create combined file if requested + if ( defined $COMBINEDFILE ) + { + my @touchcom = ("touch", "$COMBINEDFILE"); + my @chmodcom = ("chmod", "600", "$COMBINEDFILE"); + my $combine = "cat $KEY $CERT > $COMBINEDFILE"; + system(@touchcom); + system(@chmodcom); + system($combine); + $COMBINEDPATH = dirname($COMBINEDFILE); + } + + # remove temporary files + my $rmtemp = "rm -f $CNF $CERT $KEY"; + system($rmtemp); + + # run c_rehash in the certificate directories + my $CERTPATH = dirname($CERTFILE); + system("c_rehash $COMBINEDPATH >/dev/null 2>&1") if defined $COMBINEDFILE; + system("c_rehash $CERTPATH >/dev/null 2>&1") if ( defined $CERTPATH && $COMBINEDPATH ne $CERTPATH ); + } + else + { + print STDERR "Can not create certificate.\n"; + return 0; + } + + return 1; +} + + +################################# MAIN ######################################## + +my ($create, $force, $hostname, $certfile, $keyfile, $combinedfile, $help); +my $result = GetOptions ("create|c" => \$create, + "force|f" => \$force, + "hostname|H=s" => \$hostname, + "certfile|C=s" => \$certfile, + "keyfile|K=s" => \$keyfile, + "combinedfile|B=s" => \$combinedfile, + "help|h" => \$help + ); + +if ( $help ) +{ + usage(); + exit 0; +} + +$certfile = "/etc/ssl/certs/self-signed-certificate.pem" unless defined $certfile; +$keyfile = "/etc/ssl/private/self-signed-certificate.key" unless defined $keyfile; +chomp $certfile; +chomp $keyfile; +chomp $combinedfile if defined $combinedfile; + + + +if (defined $create) +{ + unless (defined $force) + { + my $ok = 1; + foreach my $F (($certfile, $keyfile, $combinedfile)) + { + if ( -e $F ) + { + print STDERR "File already exists: $F\n"; + $ok = 0; + } + } + unless ( $ok == 1 ) + { + print STDERR "Please use --force to overwrite.\n"; + exit 1; + } + } + + $hostname = `hostname --fqdn` unless defined $hostname; + chomp $hostname if defined $hostname; + unless (defined $hostname) + { + print STDERR "Hostname missing or invalid. Aborting.\n"; + exit 1; + } + + if ( create_certificate( $hostname, $certfile, $keyfile, $combinedfile ) ) + { + print "Successfully created certificate.\n"; + exit 0; + } + else + { + print STDERR "Error when creating the certificate.\n"; + exit 1; + } + +} +else +{ + my $exitcode = 0; + foreach my $F (($certfile, $keyfile, $combinedfile)) + { + if (defined $F) + { + if ( -e $F ) + { + next; + } + else + { + print STDERR "File does not exist: $F\n"; + $exitcode = 1; + } + } + } + exit $exitcode; +} + -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <web-client> backgroud_patches_bnc550934 : check certificate creation script to fix (bnc#550395) needs to be hooked into rcscript
by J.Daniel Schmidt 19 Nov '09

19 Nov '09

ref: refs/heads/backgroud_patches_bnc550934 commit 008138110dd541ba72bb8eb5679826259bf1b170 Author: J. Daniel Schmidt <jdsn(a)suse.de> Date: Thu Nov 19 20:46:48 2009 +0100 check certificate creation script to fix (bnc#550395) needs to be hooked into rcscript --- webclient/package/check-create-certificate.pl | 219 +++++++++++++++++++++++++ 1 files changed, 219 insertions(+), 0 deletions(-) diff --git a/webclient/package/check-create-certificate.pl b/webclient/package/check-create-certificate.pl new file mode 100755 index 0000000..366cee8 --- /dev/null +++ b/webclient/package/check-create-certificate.pl @@ -0,0 +1,219 @@ +#!/usr/bin/perl -w + +# create-ssl-certificate.pl +# Check and create a self-signed 2048 bit RSA SSL certificate. +# Target issue: non-interactively create a certificate for any kind of a webservice or webserver. +# +# Author: J. Daniel Schmidt <jdsn(a)suse.de> +# License: GPLv2 +# +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# + + +use strict; +use Getopt::Long qw(:config no_ignore_case);; +use File::Basename; + + +sub usage +{ + print STDERR "\n"; + print STDERR "usage: $0 [--create] [--force] [--path <path>] [--hostname <name>]\n"; + print STDERR " $0 --help\n"; + print STDERR "\n"; + print STDERR " Check for and create a 2048 bit rsa SSL certificate, key file and optionally a combined file.\n"; + print STDERR " Target issue: non-interactively create a certificate for any kind of a webservice or webserver.\n"; + print STDERR "\n"; + print STDERR "Options:\n"; + print STDERR " -c [--create] create certificate unless it exists\n"; + print STDERR " if omitted exitance of certificate files will only be checked\n"; + print STDERR " -f [--force] force to overwrite certificate\n"; + print STDERR " -h [--help] this help\n"; + print STDERR " -H [--hostname] <name> define hostname to use for certificate\n"; + print STDERR " if omitted defaults to 'hostname --fqdn'\n"; + print STDERR " -C [--certfile] <file> define certificate file\n"; + print STDERR " if omitted defaults to /etc/ssl/certs/self-signed-certificate.pem\n"; + print STDERR " -K [--keyfile] <file> define key file\n"; + print STDERR " if omitted defaults to /etc/ssl/private/self-signed-certificate.key\n"; + print STDERR " -B [--combinedfile] <file> define combination file of key and certificate\n"; + print STDERR " will not be created or checked if omitted\n"; + print STDERR "\n"; +} + + +sub create_certificate($$$$) +{ + my $fqdn = shift || return undef; + my $CERTFILE = shift || return undef; + my $KEYFILE = shift || return undef; + my $COMBINEDFILE = shift || undef; + chomp $fqdn; + chomp $CERTFILE; + chomp $KEYFILE; + chomp $COMBINEDFILE if defined $COMBINEDFILE; + + my $config=" +[req] +distinguished_name = user_dn +# x509_extensions = v3_ca +prompt=no + +[user_dn] +commonName = $fqdn +emailAddress = root\@$fqdn +"; + + my $CNF = `mktemp /tmp/create-ssl-config-XXXXX`; + my $CERT = `mktemp /tmp/create-ssl-cert-XXXXX`; + my $KEY = `mktemp /tmp/create-ssl-key-XXXXX`; + chomp $CNF; + chomp $CERT; + chomp $KEY; + if ( not defined $CNF || $CNF =~ /^$/ || + not defined $CERT || $CERT =~ /^$/ || + not defined $KEY || $KEY =~ /^$/ ) + { + print STDERR "Could not create temporary files. Aborting.\n"; + return 0; + } + + my @chmodcmdcnf = ("chmod", "644", "$CNF"); + my @chmodcmdkey = ("chmod", "600", "$KEY"); + my @chmodcmdcert = ("chmod", "644", "$CERT"); + system( @chmodcmdcnf ); + system( @chmodcmdkey ); + system( @chmodcmdcert ); + + open(CONF, ">$CNF"); + print CONF $config; + close CONF; + + my @OPENSSLCMD = ("openssl", "req", "-newkey", "rsa:2048", "-x509", "-nodes", "-days", "1095", "-batch", "-config", "$CNF", "-out", "$CERT", "-keyout", "$KEY"); + if ( system(@OPENSSLCMD) == 0 ) + { + my $COMBINEDPATH = ""; + # copy certificate and key to target location + my @copycert = ("cp", "-a", "$CERT", "$CERTFILE"); + my @copykey = ("cp", "-a", "$KEY", "$KEYFILE"); + system(@copycert); + system(@copykey); + + # create combined file if requested + if ( defined $COMBINEDFILE ) + { + my @touchcom = ("touch", "$COMBINEDFILE"); + my @chmodcom = ("chmod", "600", "$COMBINEDFILE"); + my $combine = "cat $KEY $CERT > $COMBINEDFILE"; + system(@touchcom); + system(@chmodcom); + system($combine); + $COMBINEDPATH = dirname($COMBINEDFILE); + } + + # remove temporary files + my $rmtemp = "rm -f $CNF $CERT $KEY"; + system($rmtemp); + + # run c_rehash in the certificate directories + my $CERTPATH = dirname($CERTFILE); + system("c_rehash $COMBINEDPATH >/dev/null 2>&1") if defined $COMBINEDFILE; + system("c_rehash $CERTPATH >/dev/null 2>&1") if ( defined $CERTPATH && $COMBINEDPATH ne $CERTPATH ); + } + else + { + print STDERR "Can not create certificate.\n"; + return 0; + } + + return 1; +} + + +################################# MAIN ######################################## + +my ($create, $force, $hostname, $certfile, $keyfile, $combinedfile, $help); +my $result = GetOptions ("create|c" => \$create, + "force|f" => \$force, + "hostname|H=s" => \$hostname, + "certfile|C=s" => \$certfile, + "keyfile|K=s" => \$keyfile, + "combinedfile|B=s" => \$combinedfile, + "help|h" => \$help + ); + +if ( $help ) +{ + usage(); + exit 0; +} + +$certfile = "/etc/ssl/certs/self-signed-certificate.pem" unless defined $certfile; +$keyfile = "/etc/ssl/private/self-signed-certificate.key" unless defined $keyfile; +chomp $certfile; +chomp $keyfile; +chomp $combinedfile if defined $combinedfile; + + + +if (defined $create) +{ + unless (defined $force) + { + my $ok = 1; + foreach my $F (($certfile, $keyfile, $combinedfile)) + { + if ( -e $F ) + { + print STDERR "File already exists: $F\n"; + $ok = 0; + } + } + unless ( $ok == 1 ) + { + print STDERR "Please use --force to overwrite.\n"; + exit 1; + } + } + + $hostname = `hostname --fqdn` unless defined $hostname; + chomp $hostname if defined $hostname; + unless (defined $hostname) + { + print STDERR "Hostname missing or invalid. Aborting.\n"; + exit 1; + } + + if ( create_certificate( $hostname, $certfile, $keyfile, $combinedfile ) ) + { + print "Successfully created certificate.\n"; + exit 0; + } + else + { + print STDERR "Error when creating the certificate.\n"; + exit 1; + } + +} +else +{ + my $exitcode = 0; + foreach my $F (($certfile, $keyfile, $combinedfile)) + { + if (defined $F) + { + if ( -e $F ) + { + next; + } + else + { + print STDERR "File does not exist: $F\n"; + $exitcode = 1; + } + } + } + exit $exitcode; +} + -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <web-client> appliance-docs : Mentioned bnc#556962
by Martin Vidner 19 Nov '09

19 Nov '09

ref: refs/heads/appliance-docs commit 306875c8c5d20363ac8318610502ddead2382782 Author: Martin Vidner <mvidner(a)suse.cz> Date: Thu Nov 19 18:35:53 2009 +0100 Mentioned bnc#556962 --- webclient/doc/appliance/webyast-announcement | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/webclient/doc/appliance/webyast-announcement b/webclient/doc/appliance/webyast-announcement index ceb0ed7..397bea9 100644 --- a/webclient/doc/appliance/webyast-announcement +++ b/webclient/doc/appliance/webyast-announcement @@ -53,6 +53,7 @@ Use your SLE registration code to register WebYaST. 555204 P2 - Collectd does not "collect" data for the status module 538048 P3 - checking for patches may fail 545627 P3 - need firewall port definitions for webyast +556962 - WebYaST does not work in SUSE Studio Testdrive See this query for a complete bug list: -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r59640 - /branches/SuSE-Code-11-SP1-Branch/network/src/modules/DNS.ycp
by kmachalkova＠svn.opensuse.org 19 Nov '09

19 Nov '09

Author: kmachalkova Date: Thu Nov 19 17:55:03 2009 New Revision: 59640 URL: http://svn.opensuse.org/viewcvs/yast?rev=59640&view=rev Log: logging Modified: branches/SuSE-Code-11-SP1-Branch/network/src/modules/DNS.ycp Modified: branches/SuSE-Code-11-SP1-Branch/network/src/modules/DNS.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/modules/DNS.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/modules/DNS.ycp Thu Nov 19 17:55:03 2009 @@ -16,7 +16,6 @@ textdomain "network"; import "NetHwDetection"; -import "Host"; import "Hostname"; import "IP"; import "NetworkInterfaces"; @@ -249,6 +248,7 @@ y2milestone("searchlist=%1", searchlist); y2milestone("hostname=%1", hostname); y2milestone("domain=%1", domain); + y2milestone("dhcp_hostname=%1, write_hostname=%2", dhcp_hostname, write_hostname); list <string> steps = [ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r59639 - in /branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src: EtcRaidtab.cc EtcRaidtab.h Md.cc Md.h MdCo.cc MdPartCo.cc MdPartCo.h
by mpatelcz＠svn.opensuse.org 19 Nov '09

19 Nov '09

Author: mpatelcz Date: Thu Nov 19 17:31:49 2009 New Revision: 59639 URL: http://svn.opensuse.org/viewcvs/yast?rev=59639&view=rev Log: Fixing Bug 554142. Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/EtcRaidtab.cc branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/EtcRaidtab.h branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Md.cc branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Md.h branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdCo.cc branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.h Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/EtcRaidtab.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/EtcRaidtab.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/EtcRaidtab.cc Thu Nov 19 17:31:49 2009 @@ -31,6 +31,7 @@ #include "y2storage/EtcRaidtab.h" #include "y2storage/AsciiFile.h" #include "y2storage/Md.h" +#include "y2storage/MdPartCo.h" using namespace std; using namespace storage; @@ -41,6 +42,7 @@ mdadmname = prefix+"/etc/mdadm.conf"; mdadm = new AsciiFile( mdadmname ); buildMdadmMap(); + buildMdadmMap2(); } EtcRaidtab::~EtcRaidtab() @@ -77,6 +79,149 @@ updateMdadmFile(); } +bool EtcRaidtab::updateEntry(const mdconf_info& info) +{ + y2mil("Called. UUID="<<info.md_uuid<<", fs_name="<<info.fs_name); + + if( info.md_uuid.empty() ) + { + y2mil("Empty Md UUID!"); + return false; + } + if( info.container_present ) + { + if( info.container_info.md_uuid.empty() ) + { + y2mil("Empty Md UUID for Container"); + return false; + } + } + + if( info.container_present ) + { + updateContainer(info); + } + //after container. + map<string,entry>::iterator i = uuidtab.find( info.md_uuid ); + if( i != uuidtab.end() ) + { + mdadm->replace( i->second.first, + i->second.last - i->second.first + 1, + ArrayLine(info) ); + } + else + { + mdadm->append(ArrayLine(info)); + } + updateMdadmFile(); + return true; +} + +bool EtcRaidtab::updateContainer(const mdconf_info& info) +{ + while( true ) + { + map<string,entry>::iterator i = uuidtab.find( info.md_uuid ); + map<string,entry>::iterator i2 = uuidtab.find(info.container_info.md_uuid); + + if( i == uuidtab.end() ) + { + // No volume yet. + if(i2 == uuidtab.end()) + { + // No container yet. + mdadm->append(ContLine(info)); + updateMdadmFile(); + return true; + } + // No Volume, but there is already Container. + mdadm->replace( i2->second.first, + i2->second.last - i2->second.first + 1, + ContLine(info) ); + updateMdadmFile(); + return true; + } + //There is Volume line. + if(i2 == uuidtab.end()) + { + //There is Volume line while no Container line. + //Insert line and make another iteration. + mdadm->insert(i->second.first,ContLine(info)); + updateMdadmFile(); + continue; + } + else + { + //there is a line for container and for volume. + if( i2->second.first >= i->second.first ) + { + // error. Container must be first + mdadm->remove(i2->second.first, + i2->second.last- i2->second.first + 1); + // and make another iteration. + updateMdadmFile(); + continue; + } + else + { + //Ok, container is before volume + mdadm->replace( i2->second.first, + i2->second.last - i2->second.first + 1, + ContLine(info) ); + updateMdadmFile(); + return true; + } + } + } +} + +string EtcRaidtab::ContLine(const mdconf_info& info) +{ + string s = "ARRAY metadata=" + info.container_info.metadata + " UUID=" + info.container_info.md_uuid; + return s; +} +string EtcRaidtab::ArrayLine(const mdconf_info& info) +{ + string line = "ARRAY " + info.fs_name; + + if( info.container_present ) + { + line = line + " container=" + info.container_info.md_uuid; + line = line + " member=" + info.member; + } + line = line + " UUID=" + info.md_uuid; + return line; +} + +//2 cases: remove volume or container +//No check if container is used by other Volume. +bool EtcRaidtab::removeEntry(const mdconf_info& info) +{ + map<string,entry>::iterator i; + if( info.md_uuid.empty() ) + { + if( info.container_present == false) + { + return false; + } + if( info.container_info.md_uuid.empty() ) + { + return false; + } + i = uuidtab.find( info.container_info.md_uuid ); + } + else + { + i = uuidtab.find( info.md_uuid ); + } + if( i != uuidtab.end() ) + { + mdadm->remove( i->second.first, i->second.last-i->second.first+1 ); + updateMdadmFile(); + } + return true; +} + void EtcRaidtab::removeEntry( unsigned num ) { @@ -92,9 +237,11 @@ EtcRaidtab::updateMdadmFile() { mtab.clear(); + uuidtab.clear(); mdadm->updateFile(); mdadm->loadFile( mdadmname ); buildMdadmMap(); + buildMdadmMap2(); } void @@ -126,3 +273,150 @@ lineno++; } } + +void +EtcRaidtab::buildMdadmMap2() +{ + unsigned lineno = 0; + entry e; + for(lineno=0; lineno<mdadm->numLines(); lineno++ ) + { + if( getLineType((*mdadm)[lineno]) == EtcRaidtab::ARRAY ) + { + unsigned endl = lineno; + string uuid; + if( getArrayLine(endl,uuid) ) + { + if(uuid.empty() ) + { + // no UUID + continue; + } + e.first = lineno; + e.last = endl-1; + uuidtab[uuid] = e; + lineno = endl-1; + } + else + { + // + } + } + else + { + // + } + } +} + +string +EtcRaidtab::getUUID(const string& line) +{ + if( line.empty() ) + { + return ""; + } + string::size_type pos = line.find("UUID="); + if( pos != string::npos ) + { + //switch 'uuid=' + pos += 5; + // 128bit - represented as 32 hex digits + 3 x ':'. + return line.substr(pos,pos+35); + } + else + { + return ""; + } +} + +EtcRaidtab::lineType +EtcRaidtab::getLineType(const string& line) +{ + if( line.empty() ) + { + return EtcRaidtab::EMPTY; + } + string type = extractNthWord(0,line); + if( type == "DEVICE") + { + return EtcRaidtab::DEVICE; + } + if( type == "ARRAY") + { + return EtcRaidtab::ARRAY; + } + if( type == "MAILFROM") + { + return EtcRaidtab::MAILFROM; + } + if( type == "PROGRAM") + { + return EtcRaidtab::PROGRAM; + } + if( type == "CREATE") + { + return EtcRaidtab::CREATE; + } + if( type == "HOMEHOST") + { + return EtcRaidtab::HOMEHOST; + } + if( type == "AUTO") + { + return EtcRaidtab::AUTO; + } + if( type.find("#") == 0 ) + { + return EtcRaidtab::COMMENT; + } + return EtcRaidtab::UNKNOWN; +} + +bool EtcRaidtab::getArrayLine(unsigned& line, string& uuid) +{ + if( getLineType((*mdadm)[line]) != EtcRaidtab::ARRAY ) + { + return false; + } + uuid = getUUID((*mdadm)[line]); + while( true ) + { + line++; + if( line >= mdadm->numLines() ) + { + if( uuid.empty() ) + return false; + else + return true; + } + EtcRaidtab::lineType lt = getLineType((*mdadm)[line]); + if( lt == EtcRaidtab::ARRAY || lt == EtcRaidtab::DEVICE || + lt == EtcRaidtab::AUTO || lt == EtcRaidtab::CREATE || + lt == EtcRaidtab::HOMEHOST || lt == EtcRaidtab::MAILFROM || + lt == EtcRaidtab::PROGRAM) + { + return true; + } + if( lt == EtcRaidtab::COMMENT || + lt == EtcRaidtab::EMPTY ) + { + continue; + } + if( lt == EtcRaidtab::UNKNOWN ) + { + // possibly following line. Check for x=y pair. + if( ((*mdadm)[line]).find("=") == string::npos ) + { + //kind of error. + return false; + } + //Check for UUID + if( uuid.empty() ) + { + uuid = getUUID((*mdadm)[line]); + } + continue; + } + } +} Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/EtcRaidtab.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/EtcRaidtab.h (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/EtcRaidtab.h Thu Nov 19 17:31:49 2009 @@ -30,6 +30,8 @@ { class AsciiFile; +class Md; +class MdPartCo; class EtcRaidtab { @@ -39,6 +41,25 @@ void updateEntry( unsigned num, const std::list<string>& entries, const string&, const std::list<string>& devs ); void removeEntry( unsigned num ); + + // From this structure line 'ARRAY' will be build in config file. + // Not all fields are mandatory + // If container is present then container line will be build + // before volume line. + struct mdconf_info + { + bool container_present; // container present + struct { + string metadata; // metadata + string md_uuid; // md uuid + } container_info; + string fs_name; // word after 'ARRAY'. + string md_uuid; // md uuid + string member; // member of container (if container is present) + }; + bool updateEntry(const mdconf_info& info); + bool removeEntry(const mdconf_info& into); + protected: struct entry { @@ -52,10 +73,38 @@ void updateMdadmFile(); void buildMdadmMap(); + void buildMdadmMap2(); + + /* Extracts UUID=uuidNumber from line. */ + string getUUID(const string& line); + enum lineType + { + DEVICE=0, + ARRAY, + MAILFROM, + PROGRAM, + CREATE, + HOMEHOST, + AUTO, + COMMENT, + EMPTY, + UNKNOWN + }; + lineType getLineType(const string& line); + + //Gets full array line, possibly consisted of several lines. + //line - will be updated and will point to first line that does not + // belong to initial array line. + //uuid - will be filled if found. + bool getArrayLine(unsigned& line, string& uuid); + string ContLine(const mdconf_info& info); + string ArrayLine(const mdconf_info& info); + bool updateContainer(const mdconf_info& info); string mdadmname; int mdadm_dev_line; std::map<unsigned,entry> mtab; + std::map<string,entry> uuidtab; // search by uuid, only for ARRAY lines. AsciiFile* mdadm; }; Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Md.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Md.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Md.cc Thu Nov 19 17:31:49 2009 @@ -34,7 +34,9 @@ #include "y2storage/SystemCmd.h" #include "y2storage/Regex.h" #include "y2storage/Container.h" +#include "y2storage/EtcRaidtab.h" #include "y2storage/StorageDefines.h" +#include "y2storage/MdPartCo.h" using namespace storage; using namespace std; @@ -75,9 +77,35 @@ md_uuid.erase( 0, pos+7 ); md_uuid = extractNthWord( 0, md_uuid ); } - c.select( "Version : " ); - if( c.retcode()==0 && c.numLines(true)>0 ) - sb_ver = extractNthWord( 2, *c.getLine(0,true) ); + // "Container" raid: IMSM, DDF + // "Version" with persistent block + has_container=false; + if( c.retcode()==0 ) + { + if( c.select( "Version : " ) ) + { + sb_ver = extractNthWord( 2, *c.getLine(0,true) ); + } + else if ( c.select( "Container : " ) ) + { + string tmpLine = *c.getLine(0,true); + string::size_type tmpPos; + // Line like: Container : /dev/md/imsm0, member 0 + sb_ver = extractNthWord( 2, tmpLine ); + //remove ',' after word. + tmpPos = sb_ver.find(","); + sb_ver.erase(tmpPos,tmpPos+1); + // get Member number + string member = extractNthWord( 4, tmpLine ); + y2mil("Md " << nm << " has container. Member " << member); + member >> md_member; + has_container = true; + } + else + { + y2war("Did not found neither Version nor Container line!"); + } + } if (c.retcode()==0 && c.numLines(true)>0 ) { y2mil( "line:\"" << *c.getLine(0,true) << "\"" ); @@ -178,6 +206,13 @@ break; } } + if( has_container ) + { + getParent(); + } + // Get md_name. It's important. + string tmpUuid; + MdPartCo::getUuidName(nm,tmpUuid,md_name); } Md::~Md() @@ -700,6 +735,86 @@ *this = rhs; } + +void Md::getParent() +{ + //in this case sb_ver will contain something like /dev/md/imsm0 + string tmp; + string::size_type pos; + SystemCmd c(MDADMBIN " --detail " + quote(sb_ver) + " --export"); + if( c.retcode() != 0 ) + { + return; + } + parent_container = sb_ver; + if( c.select( "MD_METADATA" ) > 0 ) + { + md_metadata = sb_ver; + tmp = *c.getLine(0,true); + pos = tmp.find("="); + tmp.erase(0,pos+1); + parent_metadata = sb_ver = tmp; + } + if(c.select( "MD_UUID" ) > 0) + { + tmp = *c.getLine(0,true); + pos = tmp.find("="); + tmp.erase(0,pos+1); + parent_uuid = tmp; + } + if( c.select( "MD_DEVNAME" ) > 0) + { + tmp = *c.getLine(0,true); + pos = tmp.find("="); + tmp.erase(0,pos+1); + parent_md_name = tmp; + } + y2mil("parent_container="<<parent_container<<", sb_ver="<<sb_ver<<", parent_uuid="<<parent_uuid + <<", parent_md_name="<<parent_md_name<<", member="<<md_member); +} + +int Md::updateEntry(EtcRaidtab* tab) +{ + if( !tab ) + { + return -1; + } + EtcRaidtab::mdconf_info info; + if( !md_name.empty() ) + { + //Raid name is preferred. + info.fs_name = "/dev/md/" + md_name; + } + else + { + info.fs_name = dev; + } + info.md_uuid = md_uuid; + if( has_container ) + { + stringstream ss; + info.container_present = true; + info.container_info.md_uuid = parent_uuid; + info.container_info.metadata = parent_metadata; + ss << md_member; + info.member = ss.str(); + } + else + { + info.container_present = false; + } + if( tab->updateEntry( info ) ) + { + return 0; + } + else + { + return -1; + } +} + + + string Md::md_names[] = { "unknown", "raid0", "raid1", "raid5", "raid6", "raid10", "multipath" }; string Md::par_names[] = { "none", "left-asymmetric", "left-symmetric", Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Md.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Md.h (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Md.h Thu Nov 19 17:31:49 2009 @@ -28,7 +28,7 @@ namespace storage { - +class EtcRaidtab; class MdCo; class Md : public Volume @@ -78,6 +78,8 @@ void logDifference( const Md& d ) const; void getState(MdStateInfo& info) const; + int updateEntry(EtcRaidtab* tab); + protected: void init(); void computeSize(); @@ -87,6 +89,9 @@ static storage::MdType toMdType( const string& val ); static storage::MdParity toMdParity( const string& val ); + void getParent(); + void setMetadata(); + storage::MdType md_type; storage::MdParity md_parity; unsigned long chunk; @@ -95,6 +100,16 @@ bool destrSb; std::list<string> devs; std::list<string> spare; + string md_name; // line in /dev/md/* + + //in case of IMSM and DDF raids there is 'container'. + bool has_container; + string md_metadata; + string parent_container; + string parent_uuid; + string parent_md_name; + string parent_metadata; + int md_member; static string md_names[storage::MULTIPATH+1]; static string par_names[storage::RIGHT_SYMMETRIC+1]; static unsigned md_major; Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdCo.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdCo.cc Thu Nov 19 17:31:49 2009 @@ -72,7 +72,8 @@ MdPair p=mdPair(Md::notDeleted); for( MdIter i=p.begin(); i!=p.end(); ++i ) { - updateEntry( &(*i) ); + //updateEntry( &(*i) ); + i->updateEntry(getStorage()->getRaidtab()); } } Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc Thu Nov 19 17:31:49 2009 @@ -495,10 +495,11 @@ return( ret ); } -int MdPartCo::nr() +int MdPartCo::nr(const string& name) { + string tmp = name; int n; - nm.erase(0,2) >> n; + tmp.erase(0,2) >> n; return n; } @@ -1150,6 +1151,12 @@ } if( parent_container!=d.parent_container ) log += " ParentContainer:" + parent_container + "-->" + d.parent_container; + if( parent_md_name!=d.parent_md_name ) + log += " ParentContMdName:" + parent_md_name + "-->" + d.parent_md_name; + if( parent_metadata!=d.parent_metadata ) + log += " ParentContMetadata:" + parent_metadata + "-->" + d.parent_metadata; + if( parent_uuid!=d.parent_uuid ) + log += " ParentContUUID:" + parent_uuid + "-->" + d.parent_uuid; y2mil(log); ConstMdPartPair pp=mdpartPair(); @@ -1191,6 +1198,10 @@ if( ret ) { const MdPartCo* mdp = dynamic_cast<const MdPartCo*>(&rhs); + if( mdp == 0 ) + { + return false; + } ret = ret && active==mdp->active && del_ptable==mdp->del_ptable; @@ -1208,9 +1219,13 @@ md_name == mdp->md_name); if( ret ) { - if( sb_ver == "imsm" || sb_ver == "ddf" ) + if( has_container ) { - ret = ret && (parent_container == mdp->parent_container); + ret = ret && + (parent_container == mdp->parent_container && + parent_md_name == mdp->parent_md_name && + parent_metadata == mdp->parent_metadata && + parent_uuid == mdp->parent_uuid); } } if( ret ) @@ -1240,7 +1255,14 @@ md_type = rhs.md_type; md_parity = rhs.md_parity; md_state = rhs.md_state; - parent_container = rhs.parent_container; + has_container = rhs.has_container; + if( has_container ) + { + parent_container = rhs.parent_container; + parent_md_name = rhs.parent_md_name; + parent_metadata = rhs.parent_metadata; + parent_uuid = rhs.parent_uuid; + } md_uuid = rhs.md_uuid; sb_ver = rhs.sb_ver; destrSb = rhs.destrSb; @@ -1429,8 +1451,14 @@ setMdParity(); setMdDevs(); setSpares(); - readMdMap(); setMetaData(); + MdPartCo::getUuidName(nm,md_uuid,md_name); + if( has_container ) + { + MdPartCo::getUuidName(parent_container,parent_uuid,parent_md_name); + y2mil("md_name="<<md_name<<", parent_container="<<parent_container + <<", parent_uuid="<<parent_uuid<<", parent_md_name"<<parent_md_name); + } y2mil("Done"); } @@ -1506,13 +1534,13 @@ string::size_type pos2; parent_container.clear(); - + has_container = false; if( md_metadata.empty() ) { (void)readProp(METADATA, md_metadata); con = md_metadata; - } + } if( con.find("external:")==0 ) { if( (pos1=con.find_first_of("/")) != string::npos ) @@ -1524,6 +1552,7 @@ //Typically: external:/md127/0 parent_container.clear(); parent_container = con.substr(pos1+1,pos2-pos1-1); + has_container = true; } } } @@ -1545,10 +1574,11 @@ { getParent(); } - if( parent_container.empty() ) + if( has_container == false ) { // No parent container. sb_ver = md_metadata; + parent_metadata.clear(); return; } @@ -1568,6 +1598,7 @@ if( pos != string::npos ) { sb_ver = val.erase(0,pos+1); + parent_metadata = sb_ver; } } return; @@ -1609,7 +1640,7 @@ list<string>::const_iterator it2; getParent(); - if( parent_container.empty() ) + if( has_container == false ) { spare.clear(); return; @@ -1660,7 +1691,7 @@ { i++; } - } + } y2war(" Map File not found"); return false; } @@ -1668,34 +1699,69 @@ /* Will try to set: UUID, Name.*/ /* Format: mdX metadata uuid /dev/md/md_name */ -bool MdPartCo::readMdMap() +bool MdPartCo::getUuidName(const string dev,string& uuid, string& mdName) { std::ifstream file; string line; classic(file); + uuid.clear(); + mdName.clear(); /* Got file, now parse output. */ - if( findMdMap(file) ) + if( MdPartCo::findMdMap(file) ) { while( !file.eof() ) { string val; getline(file,line); val = extractNthWord( MAP_DEV, line ); - if( val == nm ) + if( val == dev ) { - size_t found; - md_uuid = extractNthWord( MAP_UUID, line ); + size_t pos; + uuid = extractNthWord( MAP_UUID, line ); val = extractNthWord( MAP_NAME, line ); - found = val.find_last_of("/"); - md_name = val.substr(found+1); + // if md_name then /dev/md/name other /dev/mdxxx + if( val.find("/md/")!=string::npos) + { + pos = val.find_last_of("/"); + mdName = val.substr(pos+1); + } file.close(); return true; } } file.close(); } - return true; + else + { + string tmp; + string::size_type pos; + //No file, employ mdadm -D name --export + SystemCmd c(MDADMBIN " --detail " + quote(dev) + " --export"); + if( c.retcode() != 0 ) + { + return false; + } + if(c.select( "MD_UUID" ) > 0) + { + tmp = *c.getLine(0,true); + pos = tmp.find("="); + tmp.erase(0,pos+1); + uuid = tmp; + } + if( c.select( "MD_DEVNAME" ) > 0) + { + tmp = *c.getLine(0,true); + pos = tmp.find("="); + tmp.erase(0,pos+1); + mdName = tmp; + } + if( !mdName.empty() && !uuid.empty() ) + { + return true; + } + } + return false; } @@ -1909,18 +1975,48 @@ updateEntry(); } - +int MdPartCo::getContMember() +{ + string::size_type pos = md_metadata.find_last_of("/"); + if( pos != string::npos ) + { + unsigned mem; + string tmp = md_metadata; + tmp.erase(0,pos+1); + tmp >> mem; + return mem; + } + return -1; +} void MdPartCo::updateEntry() { EtcRaidtab* tab = getStorage()->getRaidtab(); if( tab ) + { + EtcRaidtab::mdconf_info info; + if( !md_name.empty() ) + { + //Raid name is preferred. + info.fs_name = "/dev/md/" + md_name; + } + else + { + info.fs_name = dev; + } + info.md_uuid = md_uuid; + if( has_container ) { - list<string> lines; - list<string> devices; - raidtabLines(lines); - getDevs( devices ); - tab->updateEntry( nr(), lines, mdadmLine(), devices ); + info.container_present = true; + info.container_info.md_uuid = parent_uuid; + info.container_info.metadata = parent_metadata; + info.member = getContMember(); } + else + { + info.container_present = false; + } + tab->updateEntry( info ); + } } string MdPartCo::mdadmLine() const Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.h (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.h Thu Nov 19 17:31:49 2009 @@ -131,7 +131,7 @@ void syncRaidtab(); - int nr(); + int nr(const string& name); /* RAID Related functionality */ unsigned long chunkSize() const { return chunk_size; } @@ -189,6 +189,9 @@ ProcPart& ppart, bool isInst); + /* Returns uuid and possibly mdName for given MD Device. + * Input parameter: dev name - like md1 */ + static bool getUuidName(const string dev,string& uuid, string& mdName); protected: // iterators over partitions @@ -317,10 +320,11 @@ /* fields in 'map' file */ enum mdMap { MAP_DEV=0, MAP_META, MAP_UUID, MAP_NAME, }; - bool findMdMap(std::ifstream& file); - bool readMdMap(); + static bool findMdMap(std::ifstream& file); + int getContMember(); + //Input: 'mdXXX' device. static storage::CType envSelection(const string& name); static bool havePartsInProc(const string& name, ProcPart& ppart); @@ -338,7 +342,11 @@ storage::MdArrayState md_state; /* Md Container - */ + bool has_container; string parent_container; + string parent_uuid; + string parent_metadata; + string parent_md_name; string md_metadata; string md_uuid; string sb_ver; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r59638 - in /branches/SuSE-Code-11-SP1-Branch/packager: VERSION package/yast2-packager.changes src/modules/AddOnProduct.ycp yast2-packager.spec.in
by locilka＠svn.opensuse.org 19 Nov '09

19 Nov '09

Author: locilka Date: Thu Nov 19 17:10:17 2009 New Revision: 59638 URL: http://svn.opensuse.org/viewcvs/yast?rev=59638&view=rev Log: - REGISTERPRODUCT from content file moved to control file to globals->require_registration (FATE #305578) - 2.17.62 Modified: branches/SuSE-Code-11-SP1-Branch/packager/VERSION branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes branches/SuSE-Code-11-SP1-Branch/packager/src/modules/AddOnProduct.ycp branches/SuSE-Code-11-SP1-Branch/packager/yast2-packager.spec.in Modified: branches/SuSE-Code-11-SP1-Branch/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/VERSION Thu Nov 19 17:10:17 2009 @@ -1 +1 @@ -2.17.61 +2.17.62 Modified: branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes Thu Nov 19 17:10:17 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Nov 19 16:51:55 CET 2009 - locilka(a)suse.cz + +- REGISTERPRODUCT from content file moved to control file to + globals->require_registration (FATE #305578) +- 2.17.62 + +------------------------------------------------------------------- Tue Apr 21 15:34:48 CEST 2009 - lslezak(a)suse.cz - Append additional RPM output to the installation log only if it Modified: branches/SuSE-Code-11-SP1-Branch/packager/src/modules/AddOnProduct.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/src/modules/AddOnProduct.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/src/modules/AddOnProduct.ycp Thu Nov 19 17:10:17 2009 @@ -671,6 +671,17 @@ * @param integer source id */ global void PrepareForRegistration (integer src_id) { + string control_file = WorkflowManager::GetCachedWorkflowFilename (`addon, src_id, ""); + + if (WorkflowManager::IncorporateControlFileOptions (control_file) == true) { + // FATE #305578: Add-On Product Requiring Registration + if (WorkflowManager::WorkflowRequiresRegistration (src_id)) { + y2milestone ("REGISTERPRODUCT (require_registration) defined in control file"); + addons_requesting_registration = add (addons_requesting_registration, src_id); + return; + } + } + string tmpdir = (string) SCR::Read (.target.tmpdir) + "/add-on-content-files/"; // create directory if doesn't exist @@ -729,7 +740,9 @@ * @param integer source id */ global void RegisterAddOnProduct (integer src_id) { - if (contains (addons_requesting_registration, src_id)) { + // FATE #305578: Add-On Product Requiring Registration + // or check the content file + if (WorkflowManager::WorkflowRequiresRegistration (src_id) || contains (addons_requesting_registration, src_id)) { y2milestone ("Repository ID %1 requests registration", src_id); WFM::CallFunction ("inst_suse_register", []); } else { @@ -777,8 +790,11 @@ symbol ret = nil; - string control = GetCachedFileFromSource (src_id, 1, "/installation.xml", "digested", true /* optional */); + string control = WorkflowManager::GetCachedWorkflowFilename (`addon, src_id, ""); if (control != nil) { + // FATE #305578: Add-On Product Requiring Registration + WorkflowManager::AddWorkflow(`addon, src_id, ""); + y2milestone ("Add-On has own control file"); ret = DoInstall_WithControlFile (control); } Modified: branches/SuSE-Code-11-SP1-Branch/packager/yast2-packager.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/yast2-packager.spec.in (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/yast2-packager.spec.in Thu Nov 19 17:10:17 2009 @@ -7,8 +7,8 @@ # HTTP.ycp BuildRequires: yast2-transfer -# URL::HidePassword() -BuildRequires: yast2 >= 2.17.47 +# New WorkflowManager +BuildRequires: yast2 >= 2.17.76 # "keeppackages" repo property BuildRequires: yast2-pkg-bindings >= 2.17.27 @@ -19,8 +19,8 @@ # "keeppackages" repo property Requires: yast2-pkg-bindings >= 2.17.27 -# URL::HidePassword() -Requires: yast2 >= 2.17.47 +# New WorkflowManager +Requires: yast2 >= 2.17.76 # unzipping license file Requires: unzip -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r59637 - /tags/stable-2_18_61/network/
by mzugec＠svn.opensuse.org 19 Nov '09

19 Nov '09

Author: mzugec Date: Thu Nov 19 17:09:56 2009 New Revision: 59637 URL: http://svn.opensuse.org/viewcvs/yast?rev=59637&view=rev Log: Created tag stable-2_18_61 for network Added: tags/stable-2_18_61/network/ - copied from r59636, trunk/network/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r59636 - /tags/stable-2_18_61/
by mzugec＠svn.opensuse.org 19 Nov '09

19 Nov '09

Author: mzugec Date: Thu Nov 19 17:09:53 2009 New Revision: 59636 URL: http://svn.opensuse.org/viewcvs/yast?rev=59636&view=rev Log: Created tag stable-2_18_61 Added: tags/stable-2_18_61/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0