Hello community, here is the log from the commit of package autoyast2 checked in at Fri Dec 7 19:57:38 CET 2007. -------- --- autoyast2/autoyast2.changes 2007-11-07 11:19:19.000000000 +0100 +++ /mounts/work_src_done/STABLE/autoyast2/autoyast2.changes 2007-12-07 11:56:17.931854000 +0100 @@ -1,0 +2,62 @@ +Fri Dec 7 11:47:42 CET 2007 - ug@suse.de + +- 2.16.3 + +------------------------------------------------------------------- +Mon Dec 3 14:24:55 CET 2007 - ug@suse.de + +- profiles can be stored encrypted + +------------------------------------------------------------------- +Tue Nov 27 11:57:17 CET 2007 - ug@suse.de + +- documentation and UI enhancement for feature #301256 added + +------------------------------------------------------------------- +Mon Nov 26 17:51:58 CET 2007 - ug@suse.de + +- halt/reboot option added to general section (feature #301256) + +------------------------------------------------------------------- +Thu Nov 22 14:39:21 CET 2007 - ug@suse.de + +- reuse EVMS fixed (#335763) + +------------------------------------------------------------------- +Wed Nov 21 11:38:45 CET 2007 - ug@suse.de + +- "mountby" documentation fixed (#307124) + +------------------------------------------------------------------- +Wed Nov 21 10:54:31 CET 2007 - ug@suse.de + +- reset module in the autoyast UI did not work (#340517) + +------------------------------------------------------------------- +Wed Nov 14 18:04:39 CET 2007 - ug@suse.de + +- complete iSCSI support added (feature #302973) + +------------------------------------------------------------------- +Wed Nov 14 12:14:21 CET 2007 - ug@suse.de + +- relative path for autoyast scripts in the location element + (second part of feature #302973) + +------------------------------------------------------------------- +Tue Nov 13 14:40:21 CET 2007 - ug@suse.de + +- relative path for autoyast profile + (first part of feature #302973) + +------------------------------------------------------------------- +Fri Nov 9 12:02:40 CET 2007 - ug@suse.de + +- copy modified profile to the installed system too (#328837) + +------------------------------------------------------------------- +Wed Nov 7 16:27:03 CET 2007 - ug@suse.de + +- some hardware information for rules was not probed (#336339) + +------------------------------------------------------------------- Old: ---- autoyast2-2.16.2.tar.bz2 New: ---- autoyast2-2.16.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.q22287/_old 2007-12-07 19:57:06.000000000 +0100 +++ /var/tmp/diff_new_pack.q22287/_new 2007-12-07 19:57:07.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package autoyast2 (Version 2.16.2) +# spec file for package autoyast2 (Version 2.16.3) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,14 +12,15 @@ Name: autoyast2 Url: http://www.suse.de/~ug -Version: 2.16.2 +Version: 2.16.3 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: autoyast2-2.16.2.tar.bz2 +Source0: autoyast2-2.16.3.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-devtools yast2-mouse yast2-testsuite yast2-transfer yast2-update +BuildRequires: yast2 >= 2.16.8 Requires: yast2-core yast2-xml libxslt yast2-installation Requires: autoyast2-installation = %{version} Requires: yast2-schema yast2 yast2-country yast2-storage @@ -49,7 +50,7 @@ Anas Nashif %package installation -Version: 2.16.2 +Version: 2.16.3 Release: 1 Summary: YaST2 - Auto Installation Modules Group: System/YaST @@ -72,7 +73,7 @@ Anas Nashif %prep -%setup -n autoyast2-2.16.2 +%setup -n autoyast2-2.16.3 %build %{prefix}/bin/y2tool y2autoconf @@ -211,7 +212,34 @@ %dir /var/adm/autoinstall/cache %dir /var/lib/autoinstall %dir /var/lib/autoinstall/autoconf + %changelog +* Fri Dec 07 2007 - ug@suse.de +- 2.16.3 +* Mon Dec 03 2007 - ug@suse.de +- profiles can be stored encrypted +* Tue Nov 27 2007 - ug@suse.de +- documentation and UI enhancement for feature #301256 added +* Mon Nov 26 2007 - ug@suse.de +- halt/reboot option added to general section (feature #301256) +* Thu Nov 22 2007 - ug@suse.de +- reuse EVMS fixed (#335763) +* Wed Nov 21 2007 - ug@suse.de +- "mountby" documentation fixed (#307124) +* Wed Nov 21 2007 - ug@suse.de +- reset module in the autoyast UI did not work (#340517) +* Wed Nov 14 2007 - ug@suse.de +- complete iSCSI support added (feature #302973) +* Wed Nov 14 2007 - ug@suse.de +- relative path for autoyast scripts in the location element + (second part of feature #302973) +* Tue Nov 13 2007 - ug@suse.de +- relative path for autoyast profile + (first part of feature #302973) +* Fri Nov 09 2007 - ug@suse.de +- copy modified profile to the installed system too (#328837) +* Wed Nov 07 2007 - ug@suse.de +- some hardware information for rules was not probed (#336339) * Wed Nov 07 2007 - locilka@suse.cz - Some variables were moved from AutoinstStorage, AutoinstGeneral, and AutoinstSoftware to AutoinstData (yast2.rpm) to break cyclic ++++++ autoyast2-2.16.2.tar.bz2 -> autoyast2-2.16.3.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.2/configure new/autoyast2-2.16.3/configure --- old/autoyast2-2.16.2/configure 2007-11-07 11:25:40.000000000 +0100 +++ new/autoyast2-2.16.3/configure 2007-12-07 11:48:23.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for autoyast2 2.16.2. +# Generated by GNU Autoconf 2.61 for autoyast2 2.16.3. # # Report bugs to http://bugs.opensuse.org/. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='autoyast2' PACKAGE_TARNAME='autoyast2' -PACKAGE_VERSION='2.16.2' -PACKAGE_STRING='autoyast2 2.16.2' +PACKAGE_VERSION='2.16.3' +PACKAGE_STRING='autoyast2 2.16.3' 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.16.2 to adapt to many kinds of systems. +`configure' configures autoyast2 2.16.3 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.16.2:";; + short | recursive ) echo "Configuration of autoyast2 2.16.3:";; 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.16.2 +autoyast2 configure 2.16.3 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.16.2, which was +It was created by autoyast2 $as_me 2.16.3, 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.16.2' + VERSION='2.16.3' cat >>confdefs.h <<_ACEOF @@ -2416,8 +2416,7 @@ - -VERSION="2.16.2" +VERSION="2.16.3" RPMNAME="autoyast2" MAINTAINER="Uwe Gansert <ug@suse.de>" @@ -3430,7 +3429,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.16.2, which was +This file was extended by autoyast2 $as_me 2.16.3, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3473,7 +3472,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\ -autoyast2 config.status 2.16.2 +autoyast2 config.status 2.16.3 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.16.2/configure.in new/autoyast2-2.16.3/configure.in --- old/autoyast2-2.16.2/configure.in 2007-11-07 11:25:35.000000000 +0100 +++ new/autoyast2-2.16.3/configure.in 2007-12-07 11:48:18.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for autoyast2 dnl -dnl -- This file is generated by y2autoconf 2.16.1 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.15.9 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(autoyast2, 2.16.2, http://bugs.opensuse.org/, autoyast2) +AC_INIT(autoyast2, 2.16.3, http://bugs.opensuse.org/, autoyast2) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -14,11 +14,10 @@ AC_PREFIX_DEFAULT(/usr) -dnl long filenames; we use GNU Make extensions and that's ok -AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) +AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.16.2" +VERSION="2.16.3" RPMNAME="autoyast2" MAINTAINER="Uwe Gansert <ug@suse.de>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.2/COPYRIGHT.english new/autoyast2-2.16.3/COPYRIGHT.english --- old/autoyast2-2.16.2/COPYRIGHT.english 1970-01-01 01:00:00.000000000 +0100 +++ new/autoyast2-2.16.3/COPYRIGHT.english 2007-12-07 11:48:48.000000000 +0100 @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.2/doc/CreateProfileDetails.xml new/autoyast2-2.16.3/doc/CreateProfileDetails.xml --- old/autoyast2-2.16.2/doc/CreateProfileDetails.xml 2007-10-04 13:00:00.000000000 +0200 +++ new/autoyast2-2.16.3/doc/CreateProfileDetails.xml 2007-11-27 11:33:24.000000000 +0100 @@ -85,7 +85,8 @@ Since now you can use the <emphasis>second_stage</emphasis> property, which can turn off autoyast after the first reboot. So the complete second stage is a manual installation (default is true, which means that autoyast is doing a - complete installation). + complete installation). Since openSUSE 11.0 you can set the boolean <emphasis>final_reboot</emphasis> + and <emphasis>final_halt</emphasis> to reboot/turn off the machine at the end of stage two. </para> <para> For the signature-handling, please read the <emphasis>Software</emphasis> chapter @@ -527,7 +528,7 @@ <entry>mountby</entry> <entry> <para> - instead of a partition number, you can tell autoyast to mount a partition by label or by uuid + instead of a partition number, you can tell autoyast to mount a partition by label, uuid, path or id which are the udev path and udev id (see /dev/disk/...) </para> <para><screen><mountby config:type="symbol">label</mountby></screen></para> </entry> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.2/doc/examples/example.generalOptions.xml new/autoyast2-2.16.3/doc/examples/example.generalOptions.xml --- old/autoyast2-2.16.2/doc/examples/example.generalOptions.xml 2007-05-18 10:43:34.000000000 +0200 +++ new/autoyast2-2.16.3/doc/examples/example.generalOptions.xml 2007-11-27 11:35:29.000000000 +0100 @@ -10,8 +10,10 @@ <accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key> </signature-handling> <mode> - <halt config:type="boolean">false</halt> - <confirm config:type="boolean">true</confirm> + <halt config:type="boolean">false</halt> + <final_reboot config:type="boolean">false</final_reboot> <! -- since 11.0 --> + <final_halt config:type="boolean">false</final_halt> <! -- since 11.0 --> + <confirm config:type="boolean">true</confirm> <second_stage config:type="boolean">true<second_stage> </mode> </general> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.2/Makefile.am new/autoyast2-2.16.3/Makefile.am --- old/autoyast2-2.16.2/Makefile.am 2007-11-07 11:25:35.000000000 +0100 +++ new/autoyast2-2.16.3/Makefile.am 2007-12-07 11:48:19.000000000 +0100 @@ -23,14 +23,13 @@ ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) -COPYRIGHT_files_gpl = README COPYING +COPYRIGHT_files_gpl = README COPYING COPYRIGHT.english COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) -# less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools instal m4 snippets # argh, executed literally diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.2/Makefile.in new/autoyast2-2.16.3/Makefile.in --- old/autoyast2-2.16.2/Makefile.in 2007-11-07 11:25:43.000000000 +0100 +++ new/autoyast2-2.16.3/Makefile.in 2007-12-07 11:48:26.000000000 +0100 @@ -223,13 +223,11 @@ DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) -COPYRIGHT_files_gpl = README COPYING +COPYRIGHT_files_gpl = README COPYING COPYRIGHT.english COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - -# less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools instal m4 snippets # argh, executed literally diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.2/README new/autoyast2-2.16.3/README --- old/autoyast2-2.16.2/README 2007-11-07 13:46:51.000000000 +0100 +++ new/autoyast2-2.16.3/README 2007-12-07 11:48:48.000000000 +0100 @@ -1,2 +1,2 @@ This program/library is part of YaST2 -See the file COPYING for license terms +See the file COPYRIGHT.english for license terms diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.2/src/clients/inst_autoinit.ycp new/autoyast2-2.16.3/src/clients/inst_autoinit.ycp --- old/autoyast2-2.16.2/src/clients/inst_autoinit.ycp 2007-05-30 08:09:38.000000000 +0200 +++ new/autoyast2-2.16.3/src/clients/inst_autoinit.ycp 2007-11-20 14:26:20.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Parses XML Profile for automatic installation * Authors: Anas Nashif <nashif@suse.de> * - * $Id: inst_autoinit.ycp 38076 2007-05-22 08:57:52Z ug $ + * $Id: inst_autoinit.ycp 42219 2007-11-20 13:26:48Z ug $ * */ @@ -164,6 +164,7 @@ Progress::Title(_("Probing hardware...")); WFM::CallFunction("inst_system_analysis", [] ); + AutoInstallRules::ProbeRules(); if( ! profileFetched ) { symbol ret = processProfile(); @@ -172,6 +173,14 @@ } } + if( haskey(Profile::current, "iscsi-client") ) { + y2milestone("iscsi-client found"); + WFM::CallFunction("iscsi-client_auto", ["Import", Profile::current["iscsi-client"]:$[]] ); + WFM::CallFunction("iscsi-client_auto", ["Write"] ); + } + + + if(UI::PollInput() == `abort) if (Popup::ConfirmAbort (`painless)) return `abort; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.2/src/clients/inst_autosetup.ycp new/autoyast2-2.16.3/src/clients/inst_autosetup.ycp --- old/autoyast2-2.16.2/src/clients/inst_autosetup.ycp 2007-09-03 17:18:05.000000000 +0200 +++ new/autoyast2-2.16.3/src/clients/inst_autosetup.ycp 2007-11-13 14:41:56.000000000 +0100 @@ -5,7 +5,7 @@ * Authors: Anas Nashif <nashif@suse.de> * Uwe Gansert <ug@suse.de> * - * $Id: inst_autosetup.ycp 40732 2007-09-03 15:05:50Z ug $ + * $Id: inst_autosetup.ycp 42018 2007-11-13 13:42:16Z ug $ */ { @@ -47,7 +47,11 @@ ")); return `abort; } - string cpcmd = sformat("mv %1 %2", AutoinstConfig::modified_profile, "/tmp/profile/autoinst.xml"); + string cpcmd = sformat("mv %1 %2","/tmp/profile/autoinst.xml", "/tmp/profile/pre-autoinst.xml"); + y2milestone("copy original profile: %1",cpcmd); + SCR::Execute(.target.bash, cpcmd); + + cpcmd = sformat("mv %1 %2", AutoinstConfig::modified_profile, "/tmp/profile/autoinst.xml"); y2milestone("moving modified profile: %1",cpcmd); SCR::Execute(.target.bash, cpcmd); return `found; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.2/src/dialogs/general_dialogs.ycp new/autoyast2-2.16.3/src/dialogs/general_dialogs.ycp --- old/autoyast2-2.16.2/src/dialogs/general_dialogs.ycp 2007-05-30 08:09:38.000000000 +0200 +++ new/autoyast2-2.16.3/src/dialogs/general_dialogs.ycp 2007-11-27 11:57:51.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: General Settings * Author: Anas Nashif <nashif@suse.de> * - * $Id: general_dialogs.ycp 38091 2007-05-22 15:10:10Z ug $ + * $Id: general_dialogs.ycp 42424 2007-11-27 10:58:27Z ug $ */ { textdomain "autoinst"; @@ -36,6 +36,8 @@ boolean confirm = mode["confirm"]:true; boolean second_stage = mode["second_stage"]:true; boolean halt = mode["halt"]:false; + boolean halt_second = mode["final_halt"]:false; + boolean reboot_second = mode["final_reboot"]:false; boolean accept_unsigned_file = signature_handling["accept_unsigned_file"]:false; boolean accept_file_without_checksum = signature_handling["accept_file_without_checksum"]:false; @@ -50,6 +52,8 @@ `Left(`CheckBox(`id(`confirm), _("Con&firm installation?"), confirm)), `Left(`CheckBox(`id(`second_stage), _("AutoYaST Second Stage"), second_stage)), `Left(`CheckBox(`id(`halt), _("Turn Off the Machine after the First Stage"), halt)), + `Left(`CheckBox(`id(`halt_second), _("Turn Off the Machine after the Second Stage"), halt_second)), + `Left(`CheckBox(`id(`reboot_second), _("Reboot the Machine after the Second Stage"), reboot_second)), `Left(`Label( _("Signature Handling") )), `Left(`CheckBox(`id(`accept_unsigned_file), _("Accept &Unsigned Files"), accept_unsigned_file)), `Left(`CheckBox(`id(`accept_file_without_checksum), _("Accept Files without a &Checksum"), accept_file_without_checksum)), @@ -99,10 +103,14 @@ confirm = (boolean)UI::QueryWidget(`id(`confirm), `Value); second_stage = (boolean) UI::QueryWidget(`id(`second_stage), `Value); halt = (boolean) UI::QueryWidget(`id(`halt), `Value); + halt_second = (boolean) UI::QueryWidget(`id(`halt_second), `Value); + reboot_second = (boolean) UI::QueryWidget(`id(`reboot_second),`Value); mode["second_stage"] = second_stage; mode["confirm"] = confirm; mode["halt"] = halt; + mode["halt_second"] = halt_second; + mode["reboot_second"] = reboot_second; AutoinstGeneral::mode = mode; signature_handling["accept_unsigned_file"] = (boolean)UI::QueryWidget(`id(`accept_unsigned_file), `Value); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.2/src/include/conftree.ycp new/autoyast2-2.16.3/src/include/conftree.ycp --- old/autoyast2-2.16.2/src/include/conftree.ycp 2007-08-21 09:20:13.000000000 +0200 +++ new/autoyast2-2.16.3/src/include/conftree.ycp 2007-12-04 11:41:29.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: This module handles the configuration for auto-installation * Authors: Anas Nashif <nashif@suse.de> * - * $Id: conftree.ycp 40318 2007-08-16 12:33:53Z ug $ + * $Id: conftree.ycp 42647 2007-12-04 10:42:12Z ug $ */ { @@ -29,7 +29,7 @@ if ( Profile::Save( AutoinstConfig::currentFile )) { Popup::Message(sformat(_("File %1 was saved successfully."), AutoinstConfig::currentFile)); - Profile::checkProfile(); +// Profile::checkProfile(); Profile::changed=false; list pathComponents = splitstring( (string)filename, "/"); integer s = size(pathComponents) - 1; @@ -119,8 +119,10 @@ { y2debug("resource: %1", resource); map resourceMap = Y2ModuleConfig::ModuleMap[resource]:$[]; - string module_auto = resourceMap["X-SuSE-YaST-AutoInstClient"]:"none"; - + string module_auto = resourceMap["X-SuSE-YaST-AutoInstClient"]:"none"; + if( haskey( Profile::current, resource ) ) { + Profile::current = remove( Profile::current, resource ); + } string profile_resource = Y2ModuleConfig::getResource(resource); WFM::CallFunction(module_auto, ["Reset"]); @@ -230,6 +232,8 @@ "menu_kickstart" ); Menu = Wizard::AddMenuEntry ( Menu , "file-menu" , _("Settin&gs"), "menu_settings" ); + Menu = Wizard::AddMenuEntry ( Menu , "file-menu" , AutoinstConfig::ProfileEncrypted ? _("change to decrypted"):_("change to encrypted"), + "change_encryption" ); Menu = Wizard::AddMenuEntry ( Menu , "file-menu", _("E&xit"), "menu_exit" ); Menu = Wizard::AddMenuEntry ( Menu , "view-menu", _("Configu&ration Tree"), @@ -560,6 +564,12 @@ module_contents(modulename); ret = `menu_new; } + else if (ret == "change_encryption" ) { + AutoinstConfig::ProfileEncrypted = !AutoinstConfig::ProfileEncrypted; + AutoinstConfig::ProfilePassword = ""; + Wizard::DeleteMenus(); // FIXME: sucks sucks sucks sucks sucks + menus(); + } else if (ret == "menu_exit") // EXIT { ret = `menu_exit; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.2/src/include/io.ycp new/autoyast2-2.16.3/src/include/io.ycp --- old/autoyast2-2.16.2/src/include/io.ycp 2007-10-24 17:33:14.000000000 +0200 +++ new/autoyast2-2.16.3/src/include/io.ycp 2007-11-13 14:41:56.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: I/O * Authors: Anas Nashif<nashif@suse.de> * - * $Id: io.ycp 41553 2007-10-24 14:39:10Z ug $ + * $Id: io.ycp 42018 2007-11-13 13:42:16Z ug $ */ { textdomain "autoinst"; @@ -257,7 +257,7 @@ } // catching nested devices done - string mounts = (string)(SCR::Read (.target.string, "/etc/mtab")); + string mounts = (string)(SCR::Read (.target.string, "/proc/mounts")); list<string> mount_list = splitstring( mounts, "\n" ); boolean already_mounted = false; foreach( string m, mount_list, ``{ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.2/src/modules/AutoInstall.ycp new/autoyast2-2.16.3/src/modules/AutoInstall.ycp --- old/autoyast2-2.16.2/src/modules/AutoInstall.ycp 2007-05-18 10:43:34.000000000 +0200 +++ new/autoyast2-2.16.3/src/modules/AutoInstall.ycp 2007-11-26 17:44:58.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Auto-installation related functions module * Author: Anas Nashif <nashif@suse.de> * - * $Id: AutoInstall.ycp 30346 2006-04-21 12:40:09Z ug $ + * $Id: AutoInstall.ycp 41911 2007-11-09 11:03:42Z ug $ */ { module "AutoInstall"; @@ -126,10 +126,15 @@ } SCR::Execute(.target.bash, sformat("/bin/cp %1 %2%3", - AutoinstConfig::xml_tmpfile , destdir , AutoinstConfig::xml_file) ); + "/tmp/profile/autoinst.xml" , destdir , AutoinstConfig::xml_file) ); SCR::Execute(.target.bash, sformat("/bin/chmod 700 %1%2", destdir , AutoinstConfig::xml_file) ); + SCR::Execute(.target.bash, sformat("/bin/cp %1 %2%3", + AutoinstConfig::profile_dir+"/pre-autoinst.xml" , destdir , AutoinstConfig::cache) ); + SCR::Execute(.target.bash, sformat("/bin/chmod 700 %1%2", + destdir , AutoinstConfig::cache+"/pre-autoinst.xml") ); + return; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.2/src/modules/AutoinstConfig.ycp new/autoyast2-2.16.3/src/modules/AutoinstConfig.ycp --- old/autoyast2-2.16.2/src/modules/AutoinstConfig.ycp 2007-05-18 10:43:34.000000000 +0200 +++ new/autoyast2-2.16.3/src/modules/AutoinstConfig.ycp 2007-12-04 11:41:29.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: This module handles the configuration for auto-installation * Authors: Anas Nashif <nashif@suse.de> * - * $Id: AutoinstConfig.ycp 29265 2006-03-22 14:48:47Z ug $ + * $Id: AutoinstConfig.ycp 42647 2007-12-04 10:42:12Z ug $ */ { module "AutoinstConfig"; @@ -24,6 +24,9 @@ // Profile Repository global string Repository = ""; + global boolean ProfileEncrypted = false; + global string ProfilePassword = ""; + // Package Repository global string PackageRepository = ""; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.2/src/modules/AutoinstGeneral.ycp new/autoyast2-2.16.3/src/modules/AutoinstGeneral.ycp --- old/autoyast2-2.16.2/src/modules/AutoinstGeneral.ycp 2007-11-07 13:46:19.000000000 +0100 +++ new/autoyast2-2.16.3/src/modules/AutoinstGeneral.ycp 2007-11-27 11:57:51.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Configuration of general settings for autoyast * Authors: Anas Nashif (nashif@suse.de) * - * $Id: AutoinstGeneral.ycp 41840 2007-11-07 12:46:18Z locilka $ + * $Id: AutoinstGeneral.ycp 42424 2007-11-27 10:58:27Z ug $ */ { @@ -98,6 +98,15 @@ summary = Summary::AddHeader(summary, _("Halting the machine after stage one")); summary = Summary::AddLine(summary, (mode["halt"]:false) ? _("Yes") : _("No")); + if( mode["final_halt"]:false == true ) { + summary = Summary::AddHeader(summary, _("Halting the machine after stage two")); + summary = Summary::AddLine(summary, _("Yes")); + } + if( mode["final_reboot"]:false == true ) { + summary = Summary::AddHeader(summary, _("Reboot the machine after stage two")); + summary = Summary::AddLine(summary, _("Yes")); + } + summary = Summary::AddHeader(summary, _("Signature Handling")); summary = Summary::AddLine(summary, (AutoinstGeneral::signature_handling["accept_unsigned_file"]:false) ? diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.2/src/modules/AutoinstLVM.ycp new/autoyast2-2.16.3/src/modules/AutoinstLVM.ycp --- old/autoyast2-2.16.2/src/modules/AutoinstLVM.ycp 2007-06-19 10:47:09.000000000 +0200 +++ new/autoyast2-2.16.3/src/modules/AutoinstLVM.ycp 2007-11-22 14:41:12.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: LVM * Authors: Anas Nashif <nashif@suse.de> * - * $Id: AutoinstLVM.ycp 38503 2007-06-18 12:39:13Z ug $ + * $Id: AutoinstLVM.ycp 42322 2007-11-22 13:41:42Z ug $ */ { @@ -88,6 +88,9 @@ y2milestone("GetTargetMap returns %1",targetMap); //ExistingLVM = filter(string k, map v, Storage::GetTargetMap(), ``(v["type"]:`CT_UNKNOWN==`CT_LVM)); ExistingLVM = filter(string k, map v, Storage::GetTargetMap(), ``(v["type"]:`CT_UNKNOWN==vmType)); + if( haskey( ExistingLVM, "/dev/evms" ) ) { + ExistingLVM = remove( ExistingLVM, "/dev/evms" ); + } ExistingVGs = maplist (string d, map g, ExistingLVM, ``{ return (substring(d, 5) ); }); @@ -482,14 +485,17 @@ list<map> lvlist = ExistingLVM[device, "partitions"]:[]; // if (contains(volume_group["keep_lv"]:[], lv["nr"]:"_error_")) { - if( contains(keepLVM[vgname]:[], lv["lv_name"]:"") ) { + if( contains(keepLVM[vgname]:[], lv["lv_name"]:"") || contains(keepEVMS[vgname]:[], lv["lv_name"]:"") ) { list<map> lvtokeep = filter(map p, lvlist, ``(p["nr"]:"" == lv["lv_name"]:"")); map this_lv = lvtokeep[0]:$[]; y2milestone("Keeping LV: %1", this_lv); y2milestone("lv = %1",lv); - lv["device"] = "/dev/"+vgname+"/"+lv["lv_name"]:""; + if( vmType == `CT_LVM ) + lv["device"] = "/dev/"+vgname+"/"+lv["lv_name"]:""; + else + lv["device"] = "/dev/evms/lvm2/"+vgname+"/"+lv["lv_name"]:""; lv["used_fs"] = this_lv["used_fs"]:`reiser; @@ -505,8 +511,7 @@ "mount" : lv["mount"]:"" , "used_fs" : this_lv["used_fs"]:`reiser, "format" : lv["format"]:false , - "type" : `lvm, - "device" : "/dev/" + current_vg + "/" + lv["name"]:"" + "device" : lv["device"]:"" ]; reslv["changed_size"] = true; Storage::ResizeVolume( "/dev/" + current_vg + "/" + lv["name"]:"", diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.2/src/modules/AutoinstScripts.ycp new/autoyast2-2.16.3/src/modules/AutoinstScripts.ycp --- old/autoyast2-2.16.2/src/modules/AutoinstScripts.ycp 2007-07-18 14:28:22.000000000 +0200 +++ new/autoyast2-2.16.3/src/modules/AutoinstScripts.ycp 2007-11-14 12:15:05.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Custom scripts * Authors: Anas Nashif <nashif@suse.de> * - * $Id: AutoinstScripts.ycp 39497 2007-07-18 12:03:44Z ug $ + * $Id: AutoinstScripts.ycp 42038 2007-11-14 11:15:26Z ug $ */ { @@ -181,6 +181,20 @@ } + global define list<map> Resolve_relurl( list<map> d ) { + d = maplist (map script , d, ``{ + if( issubstring( script["location"]:"", "relurl://" ) ) { + string l = script["location"]:""; + l = substring ( l, 9 ); + string newloc = AutoinstConfig::scheme + "://" + AutoinstConfig::host + "/" + AutoinstConfig::directory + l; + script["location"] = newloc; + y2milestone("changed relurl to %1 for script", newloc); + } + return script; + }); + + return d; + } /** * Get all the configuration from a map. @@ -196,6 +210,12 @@ init = s["init-scripts"]:[]; post = s["post-scripts"]:[]; chroot = s["chroot-scripts"]:[]; + + pre = Resolve_relurl(pre); + init = Resolve_relurl(init); + post = Resolve_relurl(post); + chroot = Resolve_relurl(chroot); + merged = mergeScripts(); y2debug("merged: %1", merged); return true; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.2/src/modules/AutoinstSoftware.ycp new/autoyast2-2.16.3/src/modules/AutoinstSoftware.ycp --- old/autoyast2-2.16.2/src/modules/AutoinstSoftware.ycp 2007-11-07 13:46:19.000000000 +0100 +++ new/autoyast2-2.16.3/src/modules/AutoinstSoftware.ycp 2007-11-26 12:16:48.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Software * Authors: Anas Nashif <nashif@suse.de> * - * $Id: AutoinstSoftware.ycp 41840 2007-11-07 12:46:18Z locilka $ + * $Id: AutoinstSoftware.ycp 42187 2007-11-19 16:19:45Z locilka $ * */ { @@ -90,7 +90,7 @@ if( size(notFound) > 0 ) { y2error("packages not found: %1",notFound); // warning text during the installation. %1 is a list of package names - Report::Error( sformat(_("These packages could not be found on the installation source:\n%1"), notFound)); + Report::Error( sformat(_("These packages could not be found in the software repositories:\n%1"), notFound)); } PackageAI::toinstall = settings["packages"]:[]; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.2/src/modules/AutoinstStorage.ycp new/autoyast2-2.16.3/src/modules/AutoinstStorage.ycp --- old/autoyast2-2.16.2/src/modules/AutoinstStorage.ycp 2007-11-07 13:46:19.000000000 +0100 +++ new/autoyast2-2.16.3/src/modules/AutoinstStorage.ycp 2007-11-22 14:41:12.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Storage * Authors: Anas Nashif <nashif@suse.de> * - * $Id: AutoinstStorage.ycp 41840 2007-11-07 12:46:18Z locilka $ + * $Id: AutoinstStorage.ycp 42322 2007-11-22 13:41:42Z ug $ */ { module "AutoinstStorage"; @@ -510,6 +510,16 @@ return settings; } + global void activateEVMS(list<map> settings) { + foreach( map d, settings, ``{ + if( d["type"]:`x == `CT_EVMS ) { + y2milestone("activate EVMS"); + Storage::ActivateEvms(); + } + }); + return; + } + /** * Get all the configuration from a map. * When called by inst_auto<module name> (preparing autoinstallation data) @@ -530,6 +540,7 @@ settings = region4resize(settings); settings = percent2size(settings); settings = setPartitionType(settings); + activateEVMS(settings); AutoPartPlan = preprocess_partition_config(settings); AutoPartPlan = checkSizes(AutoPartPlan); } else { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.2/src/modules/ProfileLocation.ycp new/autoyast2-2.16.3/src/modules/ProfileLocation.ycp --- old/autoyast2-2.16.2/src/modules/ProfileLocation.ycp 2007-05-18 10:43:34.000000000 +0200 +++ new/autoyast2-2.16.3/src/modules/ProfileLocation.ycp 2007-12-03 14:25:29.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Process Auto-Installation Location * Author: Anas Nashif <nashif@suse.de> * - * $Id: ProfileLocation.ycp 27288 2006-01-24 14:29:15Z ug $ + * $Id: ProfileLocation.ycp 42597 2007-12-03 13:26:11Z ug $ */ { module "ProfileLocation"; @@ -49,6 +49,32 @@ boolean is_directory = false; + if( AutoinstConfig::scheme == "relurl" ) { + // FIXME: + // file # local file + + AutoinstConfig::scheme = (string)SCR::Read(.etc.install_inf.InstMode); + if( AutoinstConfig::scheme == "hd" || AutoinstConfig::scheme == "harddisk" || AutoinstConfig::scheme == "disk" ) { + string part = (string)SCR::Read(.etc.install_inf.Partition); + AutoinstConfig::scheme = "device"; + AutoinstConfig::host = part; + AutoinstConfig::filepath = (string)SCR::Read(.etc.install_inf.Serverdir) + "/" + AutoinstConfig::filepath;; + } else { + if( AutoinstConfig::scheme == "cd" || AutoinstConfig::scheme == "cdrom" ) { + AutoinstConfig::scheme = "file"; + } + if( size(AutoinstConfig::filepath) > 0 ) { + AutoinstConfig::filepath = (string)SCR::Read(.etc.install_inf.Serverdir)+"/"+AutoinstConfig::host+"/"+AutoinstConfig::filepath; + } else { + AutoinstConfig::filepath = (string)SCR::Read(.etc.install_inf.Serverdir)+"/"+AutoinstConfig::host; + } + if( (string)SCR::Read(.etc.install_inf.Server) != nil ) { + AutoinstConfig::host = (string)SCR::Read(.etc.install_inf.Server); + } + } + + y2milestone("relurl for profile changed to: %1://%2%3",AutoinstConfig::scheme, AutoinstConfig::host, AutoinstConfig::filepath); + } string filename = basename(AutoinstConfig::filepath); @@ -67,6 +93,32 @@ Popup::Error( error + GET_error ); return false; } + string tmp = (string)SCR::Read (.target.string, localfile); + list<string> l = splitstring (tmp, "\n"); + while ( tmp != nil && l[0]:"" == "-----BEGIN PGP MESSAGE-----" ) { + y2milestone("encrypted profile found"); + UI::OpenDialog( + `VBox( + `Label("Encrypted AutoYaST profile. Please enter the correct password."), + `Password(`id(`password), ""), + `PushButton(`id(`ok), "&OK") + ) + ); + string p = ""; + any button = nil; + repeat { + button = UI::UserInput(); + p = (string) UI::QueryWidget(`id(`password), `Value); + } until ( button == `ok ); + UI::CloseDialog(); + SCR::Execute( .target.bash, sformat("gpg2 --batch --output "/tmp/decrypt.xml" --passphrase "%1" %2",p, localfile) ); + if( SCR::Read (.target.size, "/tmp/decrypt.xml") > 0 ) { + SCR::Execute( .target.bash, sformat("mv /tmp/decrypt.xml %1",localfile) ); + y2milestone("decrypted. Moving now /tmp/decrypt.xml to %1",localfile); + tmp = (string)SCR::Read (.target.string, localfile); + l = splitstring (tmp, "\n"); + } + } } else { @@ -123,7 +175,8 @@ } else { - try_default_rules = true; +// try_default_rules = true; + try_default_rules = is_directory; } // Hex IP, MAC Address. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.2/src/modules/Profile.ycp new/autoyast2-2.16.3/src/modules/Profile.ycp --- old/autoyast2-2.16.2/src/modules/Profile.ycp 2007-05-18 10:43:34.000000000 +0200 +++ new/autoyast2-2.16.3/src/modules/Profile.ycp 2007-12-04 11:41:29.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Profile handling * Authors: Anas Nashif <nashif@suse.de> * - * $Id: Profile.ycp 37038 2007-03-20 10:10:39Z ug $ + * $Id: Profile.ycp 42647 2007-12-04 10:42:12Z ug $ */ { module "Profile"; @@ -124,6 +124,22 @@ current["timezone"] = current["general","clock"]:$[]; current["general"] = remove( current["general"]:$[], "clock" ); } + if( current["general","mode","final_halt"]:false ) { + map script = $[ "filename":"zzz_halt", "source":"shutdown -h now" ]; + if( ! haskey( current, "scripts" ) ) + current["scripts"] = $[]; + if( ! haskey( current["scripts"]:$[], "init-scripts" ) ) + current["scripts","init-scripts"] = []; + current["scripts","init-scripts"] = add( current["scripts","init-scripts"]:[], script ); + } + if( current["general","mode","final_reboot"]:false ) { + map script = $[ "filename":"zzz_reboot", "source":"shutdown -r now" ]; + if( ! haskey( current, "scripts" ) ) + current["scripts"] = $[]; + if( ! haskey( current["scripts"]:$[], "init-scripts" ) ) + current["scripts","init-scripts"] = []; + current["scripts","init-scripts"] = add( current["scripts","init-scripts"]:[], script ); + } if( haskey( current["software"]:$[], "additional_locales" ) ) { if( ! haskey(current, "language") ) { current["language"] = $[]; @@ -302,8 +318,47 @@ global define boolean Save (string file) { Prepare(); + boolean ret = false; y2debug("Saving data (%1) to XML file %2", current, file); - return (XML::YCPToXMLFile(`profile, current, file)); + if( AutoinstConfig::ProfileEncrypted ) { + string xml = XML::YCPToXMLString(`profile, current); + if( size(xml) > 0 ) { + if( AutoinstConfig::ProfilePassword == "" ) { + string p = ""; + string q = ""; + do { + UI::OpenDialog( + `VBox( + `Label("Encrypted AutoYaST profile. Please enter the password twice"), + `Password(`id(`password), ""), + `Password(`id(`password2), ""), + `PushButton(`id(`ok), "&OK") + ) + ); + any button = nil; + repeat { + button = UI::UserInput(); + p = (string) UI::QueryWidget(`id(`password), `Value); + q = (string) UI::QueryWidget(`id(`password2), `Value); + } until ( button == `ok ); + UI::CloseDialog(); + } while( p != q ); + AutoinstConfig::ProfilePassword = p; + } + string dir = (string)SCR::Read(.target.tmpdir); + string command = sformat("gpg2 -c --armor --batch --passphrase "%1" --output %2/encrypted_autoyast.xml", + AutoinstConfig::ProfilePassword,dir); + SCR::Execute(.target.bash_input, command, xml); + if( SCR::Read(.target.size, dir+"/encrypted_autoyast.xml") > 0 ) { + command = sformat( "mv %1/encrypted_autoyast.xml %2", dir, file ); + SCR::Execute(.target.bash, command, $[]); + ret = true; + } + } + } else { + ret = XML::YCPToXMLFile(`profile, current, file); + } + return ret; } @@ -565,8 +620,34 @@ * @return boolean */ global define boolean ReadXML (string file) { - y2debug("Reading %1", file); - current = XML::XMLToYCPFile(file); + string tmp = (string)SCR::Read (.target.string, file); + list<string> l = splitstring (tmp, "\n"); + if( tmp != nil && l[0]:"" == "-----BEGIN PGP MESSAGE-----" ) { + map<string,any> out = $[]; + while( out["stdout"]:"" == "" ) { + UI::OpenDialog( + `VBox( + `Label("Encrypted AutoYaST profile. Please enter the correct password."), + `Password(`id(`password), ""), + `PushButton(`id(`ok), "&OK") + ) + ); + string p = ""; + any button = nil; + repeat { + button = UI::UserInput(); + p = (string) UI::QueryWidget(`id(`password), `Value); + } until ( button == `ok ); + UI::CloseDialog(); + string command = sformat("gpg2 -d --batch --passphrase "%1" %2",p, file); + out = (map<string,any>)SCR::Execute(.target.bash_output, command, $[]); + } + current = XML::XMLToYCPString( out["stdout"]:"" ); + AutoinstConfig::ProfileEncrypted = true; + } else { + y2debug("Reading %1", file); + current = XML::XMLToYCPFile(file); + } if ( current != $[] && size(current) == 0 ) { @@ -596,7 +677,6 @@ if( is( tmp[0]:nil, string ) ) { m[i] = setMValue( tmp, v, m[i]:$[] ); } else { - y2milestone("I'm in else"); m[i] = setLValue( tmp, v, m[i]:[] ); } } else { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.2/src/schema/general.rnc new/autoyast2-2.16.3/src/schema/general.rnc --- old/autoyast2-2.16.2/src/schema/general.rnc 2007-09-07 14:47:22.000000000 +0200 +++ new/autoyast2-2.16.3/src/schema/general.rnc 2007-11-26 17:58:52.000000000 +0100 @@ -40,10 +40,14 @@ mode = element mode { - confirm? & halt? & second_stage? + confirm? & halt? & second_stage? & final_halt? & final_reboot? } confirm = element confirm { BOOLEAN } +final_halt = + element final_halt { BOOLEAN } +final_reboot = + element final_reboot { BOOLEAN } halt = element halt { BOOLEAN } second_stage = diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.2/VERSION new/autoyast2-2.16.3/VERSION --- old/autoyast2-2.16.2/VERSION 2007-11-07 11:15:07.000000000 +0100 +++ new/autoyast2-2.16.3/VERSION 2007-12-07 11:47:38.000000000 +0100 @@ -1 +1 @@ -2.16.2 +2.16.3 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org