Hello community, here is the log from the commit of package autoyast2 for openSUSE:Factory checked in at 2013-07-21 11:47:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/autoyast2 (Old) and /work/SRC/openSUSE:Factory/.autoyast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "autoyast2" Changes: -------- --- /work/SRC/openSUSE:Factory/autoyast2/autoyast2.changes 2013-07-01 15:52:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.autoyast2.new/autoyast2.changes 2013-07-21 11:47:43.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Jul 16 12:17:06 CEST 2013 - [email protected] + +- version 2.24.4 +- fix scripts with chrooted=true via nfs (bnc#829265) +- /sbin/portmap does not exist any more, no starting in io.ycp + +------------------------------------------------------------------- Old: ---- autoyast2-2.24.3.tar.bz2 New: ---- autoyast2-2.24.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.uqhBh9/_old 2013-07-21 11:47:44.000000000 +0200 +++ /var/tmp/diff_new_pack.uqhBh9/_new 2013-07-21 11:47:44.000000000 +0200 @@ -17,7 +17,7 @@ Name: autoyast2 -Version: 2.24.3 +Version: 2.24.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -182,7 +182,6 @@ /usr/share/YaST2/include/autoinstall/classes.ycp /usr/share/YaST2/include/autoinstall/conftree.ycp /usr/share/YaST2/include/autoinstall/dialogs.ycp -/usr/share/YaST2/include/autoinstall/partition_dialogs.ycp /usr/share/YaST2/include/autoinstall/script_dialogs.ycp /usr/share/YaST2/include/autoinstall/general_dialogs.ycp /usr/share/YaST2/include/autoinstall/wizards.ycp ++++++ autoyast2-2.24.3.tar.bz2 -> autoyast2-2.24.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.24.3/VERSION new/autoyast2-2.24.4/VERSION --- old/autoyast2-2.24.3/VERSION 2013-05-29 16:56:33.000000000 +0200 +++ new/autoyast2-2.24.4/VERSION 2013-07-17 15:36:45.000000000 +0200 @@ -1 +1 @@ -2.24.3 +2.24.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.24.3/autodocs-ycp.ami new/autoyast2-2.24.4/autodocs-ycp.ami --- old/autoyast2-2.24.3/autodocs-ycp.ami 2013-06-28 17:08:00.000000000 +0200 +++ new/autoyast2-2.24.4/autodocs-ycp.ami 2013-07-17 15:36:54.000000000 +0200 @@ -24,7 +24,7 @@ index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM) #including *.pm, for the index - ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP) + if [ -n "$(AUTODOCS_YCP)" ]; then ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP); fi for i in $(AUTODOCS_PM); do \ b=$${i##$(AUTODOCS_STRIP)}; b=$${b#/}; b=$${b//\//__}; b=$${b%.pm}; \ pod2html --title=$$b --infile=$$i --outfile=$$b.html; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.24.3/configure new/autoyast2-2.24.4/configure --- old/autoyast2-2.24.3/configure 2013-06-28 17:08:04.000000000 +0200 +++ new/autoyast2-2.24.4/configure 2013-07-17 15:36:58.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for autoyast2 2.24.3. +# Generated by GNU Autoconf 2.69 for autoyast2 2.24.4. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='autoyast2' PACKAGE_TARNAME='autoyast2' -PACKAGE_VERSION='2.24.3' -PACKAGE_STRING='autoyast2 2.24.3' +PACKAGE_VERSION='2.24.4' +PACKAGE_STRING='autoyast2 2.24.4' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1247,7 +1247,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.24.3 to adapt to many kinds of systems. +\`configure' configures autoyast2 2.24.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1318,7 +1318,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of autoyast2 2.24.3:";; + short | recursive ) echo "Configuration of autoyast2 2.24.4:";; esac cat <<\_ACEOF @@ -1398,7 +1398,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -autoyast2 configure 2.24.3 +autoyast2 configure 2.24.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1415,7 +1415,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.24.3, which was +It was created by autoyast2 $as_me 2.24.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2354,7 +2354,7 @@ # Define the identity of the package. PACKAGE='autoyast2' - VERSION='2.24.3' + VERSION='2.24.4' cat >>confdefs.h <<_ACEOF @@ -2477,7 +2477,7 @@ -VERSION="2.24.3" +VERSION="2.24.4" RPMNAME="autoyast2" MAINTAINER="Thomas Fehr <[email protected]>" @@ -3407,7 +3407,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.24.3, which was +This file was extended by autoyast2 $as_me 2.24.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3460,7 +3460,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -autoyast2 config.status 2.24.3 +autoyast2 config.status 2.24.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.24.3/configure.in new/autoyast2-2.24.4/configure.in --- old/autoyast2-2.24.3/configure.in 2013-06-28 17:08:00.000000000 +0200 +++ new/autoyast2-2.24.4/configure.in 2013-07-17 15:36:54.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for autoyast2 dnl -dnl -- This file is generated by y2autoconf 2.24.1 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.24.2 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(autoyast2, 2.24.3, http://bugs.opensuse.org/, autoyast2) +AC_INIT(autoyast2, 2.24.4, http://bugs.opensuse.org/, autoyast2) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.24.3" +VERSION="2.24.4" RPMNAME="autoyast2" MAINTAINER="Thomas Fehr <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.24.3/doc/autodocs/Makefile.in new/autoyast2-2.24.4/doc/autodocs/Makefile.in --- old/autoyast2-2.24.3/doc/autodocs/Makefile.in 2013-06-28 17:08:05.000000000 +0200 +++ new/autoyast2-2.24.4/doc/autodocs/Makefile.in 2013-07-17 15:36:59.000000000 +0200 @@ -455,7 +455,7 @@ index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM) #including *.pm, for the index - ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP) + if [ -n "$(AUTODOCS_YCP)" ]; then ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP); fi for i in $(AUTODOCS_PM); do \ b=$${i##$(AUTODOCS_STRIP)}; b=$${b#/}; b=$${b//\//__}; b=$${b%.pm}; \ pod2html --title=$$b --infile=$$i --outfile=$$b.html; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.24.3/src/clients/storage_auto.ycp new/autoyast2-2.24.4/src/clients/storage_auto.ycp --- old/autoyast2-2.24.3/src/clients/storage_auto.ycp 2013-01-22 13:34:22.000000000 +0100 +++ new/autoyast2-2.24.4/src/clients/storage_auto.ycp 2013-07-03 11:25:50.000000000 +0200 @@ -20,7 +20,6 @@ import "FileSystems"; import "Label"; -/* include "autoinstall/partition_dialogs.ycp"; */ include "autoinstall/StorageDialog.ycp"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.24.3/src/dialogs/partition_dialogs.ycp new/autoyast2-2.24.4/src/dialogs/partition_dialogs.ycp --- old/autoyast2-2.24.3/src/dialogs/partition_dialogs.ycp 2013-01-22 13:34:22.000000000 +0100 +++ new/autoyast2-2.24.4/src/dialogs/partition_dialogs.ycp 1970-01-01 01:00:00.000000000 +0100 @@ -1,1110 +0,0 @@ -/** - * File: - * partition_dialogs.ycp - * - * Module: - * Partitioning - * - * Summary: - * Handle Partitioning data - * - * Authors: - * Anas Nashif <[email protected]> - * - * $Id$ - */ -{ - textdomain "autoinst"; - import "Label"; - import "Popup"; - import "String"; - import "AutoinstStorage"; - import "Partitions"; - - include "partitioning/custom_part_dialogs.ycp"; - include "partitioning/custom_part_helptexts.ycp"; - include "partitioning/custom_part_lib.ycp"; - - include "autoinstall/helps.ycp"; - - - Storage::GetTargetMap(); // initialize libstorage - - /** - * CheckIfMaxSet() - * @param string item - * @return boolean - */ - define boolean CheckIfMaxSet( string item ) - { - y2milestone("item %1", item); - boolean exists = false; - map drive = select( - filter( - map d, AutoinstStorage::AutoPartPlan, - ``(item == d["device"]:"")), 0, $[] - ); - - list<map> ps = drive["partitions"]:[]; - foreach (map p, ps, ``{ - - if (p["size"]:"" == "max") - exists = true; - }); - - return exists; - } - - - /** - * Get target - * @return map targets - */ - define map<string, map> getTargets () - { - map<string, map> auto_targets = listmap (map d, AutoinstStorage::AutoPartPlan, ``{ - string device = d["device"]:""; - return ($[device:d]); - }); - return auto_targets; - } - - /* - * Partition Dialog - * - * @param mode mode of operation - * @param item item to edit - * @return symbol - */ - define symbol PartitionDialog (symbol mode, string item) - { - - list<map> partitioning = AutoinstStorage::AutoPartPlan; - list<string> item_id = splitstring(item,":"); - - map this_drive = $[]; - string drive = ""; - map<string, any> new_val = $[]; - - if (size(item_id)>1) - { //Partition - this_drive = select (filter (map d, - partitioning, - ``(d["device"]:"" == item_id[0]:"")), - 0, - $[] - ); - new_val = (map<string, any>) select (this_drive["partitions"]:[], tointeger (item_id[1]:"") - 1, $[]); - drive = (string) item_id[0]:""; - } - else - { - this_drive = select (filter (map d, partitioning,``(d["device"]:"" == item)),0,$[]); - new_val = $[ - "partition_id" : 131, - "filesystem" : Partitions::DefaultFs() - ]; - drive = item; - } - - new_val["fsid"] = new_val["partition_id"]:Partitions::fsid_native; - new_val["used_fs"] = new_val["filesystem"]:Partitions::DefaultFs(); - - list<string> vgs = []; - foreach( map d, partitioning, ``{ - if( d["type"]:`x == `CT_LVM ) { - vgs = add(vgs, substring( d["device"]:"", 5 ) ); - } - }); - - list<map> other_drives = filter (map d, partitioning, ``(d["device"]:"" != drive)); - - map<symbol, map<symbol, any> > file_systems = FileSystems::GetAllFileSystems(true, true); - boolean create = new_val["create"]:true; - string partition_size = new_val["size"]:""; - string partition_nr = tostring(new_val["partition_nr"]:-1); - if( partition_nr == "-1" ) - partition_nr = ""; - boolean format = new_val["format"]:false; - - string partition_type = new_val["partition_type"]:""; - string lv_name = new_val["lv_name"]:""; - - symbol last_option_fs = new_val["filesystem"]:`ext2; - map fs_options = new_val["fs_options"]:$[]; - - boolean resize = new_val["resize"]:false; - boolean reuse = !create; - - list<string> not_used_mountpoints = notUsedMountpoints( getTargets(), file_systems[last_option_fs, `mountpoints]:[]); - - - string helptext = _(" -<P>Enter the partition information according to your -needs. To reuse an existing partition, enter the partition number of the existing partition to reuse (counting starts with partition number 1) and no size.</P> -<p> -For partitions that are part of a volume group (not the logical partitions inside a volume group), set the partition ID to 0x8e then choose the volume group. The volume group must already be set up with AutoYaST. -</p> -<P>For more information, refer to the online documentation. -</P> -"); - string title = ""; - if (mode == `create ) - { - title = _("Create New Partition"); - } - else - { - title = _("Edit Partition"); - } - - term field_dlg_right = - `VBox( - `Top( - `VBox( - `HBox( - `TextEntry(`id(`partsize), _("&Size"), - (partition_size!="auto" && partition_size!="max") ? partition_size : "" ), - `TextEntry(`id(`partition_nr), _("&Partition Number"), partition_nr ) - ), - `RadioButtonGroup(`id(`sizeopt), - `VBox( - `Left( - `RadioButton(`id(`fixed), - `opt(`notify), - _("&Fixed Size"), - (partition_size != "auto" - && partition_size != "max") - ) - ), - `Left( - `RadioButton(`id(`reuse), - `opt(`notify), - _("&Reuse Partition"), - reuse - ) - ), - `Left( - `CheckBox(`id(`resize), - `opt(`notify), - _("R&esize Partition"), - resize - ) - ), - `Left( - `RadioButton(`id(`max), - `opt(`notify), - _("Fill to &maximum allowable space"), - ( partition_size == "max") - ) - ), - `Left( - `RadioButton(`id(`auto), - `opt(`notify), - _("Determine &automatically (only /boot and swap)"), - ( partition_size == "auto") - ) - ) - ) - ), - `VSpacing(0.5), - `Left( - `CheckBox(`id(`asprimary), _("Create as a Primary Partition"), ( (partition_type =="primary") ? true : false) ) - ), - `VSpacing(1), - `Left( - `ComboBox( `id(`vg), _("Volume Group"), vgs ) - ), - `Left( - `TextEntry( `id(`lv_name), _("Logical Volume Name"), lv_name ) - ) - ) - ), - `VSpacing(1), - `ReplacePoint( `id(`mount_dlg_rp), MountDlg( new_val , not_used_mountpoints )) - ); - y2milestone("New values: %1", new_val); - - term field_dlg_left = `Top( `ReplacePoint( `id( `format_dlg_rp), FormatDlg( new_val, file_systems) )); - - UI::OpenDialog( - `opt(`decorated ), - `HBox( - `HWeight(30, `RichText( helptext)), - `HStretch(), - `HSpacing(1), - `HWeight(70, - `VBox( - `Heading( title), - `VSpacing(1), - `VStretch(), - `HBox( - field_dlg_left, - `HSpacing(2), - field_dlg_right //, - //`HSpacing(2) - ), - `VSpacing(1), - `VStretch(), - `ButtonBox( - // popup create partition: - `PushButton(`id(`ok), Label::OKButton() ), - - // popup create partition: - `PushButton(`id(`cancel), Label::CancelButton() ) - ) - ) - ), - `HSpacing(1), - `HStretch() - ) - ); - - map<string, any> return_value = new_val; - - if (partition_size == "auto") - { - UI::ChangeWidget(`id(`partsize) , `Enabled, false); - } - - any ret = nil; - boolean pdisk = false; // TODO - boolean pdisk_disk = false; // TODO - - list set_false = []; - - - if( ! format ) - { - set_false = union( set_false, [ `crypt_fs, `fs, `fs_options] ); -// if( create ) set_false = union( set_false, [`mount_point ] ); - if( pdisk_disk ) set_false = add( set_false, `fsid_point); - } - else - { - set_false = union( set_false, [ `fsid_point]); - } - - - if ( new_val["partition_id"]:131 == 130 ) - { - set_false = union( set_false, [ `crypt_fs ] ); - - } - - ChangeExistingSymbolsState( set_false, false); - UI::ChangeWidget(`id(`partition_nr), `ValidChars, "0123456789"); - if( substring( (string)UI::QueryWidget( `id(`fsid_point), `Value), 0, 4 ) == "0x8E" ) { - UI::ChangeWidget(`id(`vg), `Enabled, true); - UI::ChangeWidget(`id(`mount_point), `Value, ""); - UI::ChangeWidget(`id(`mount_point), `Enabled, false); - } else { - UI::ChangeWidget(`id(`vg), `Enabled, false); - } - if( this_drive["type"]:`x != `CT_LVM ) { - UI::ChangeWidget(`id(`lv_name), `Enabled, false); - } - UI::ChangeWidget(`id(`resize), `Enabled, UI::QueryWidget(`id(`sizeopt), `CurrentButton) == `reuse ); - - while (true) - { - - ret = UI::UserInput(); - - if (ret != `cancel) - { - UI::ChangeWidget(`id(`resize), `Enabled, UI::QueryWidget(`id(`sizeopt), `CurrentButton) == `reuse ); - if( ret == `fsid_point ) { - if( substring( (string)UI::QueryWidget(`id(`fsid_point), `Value), 0, 4 ) == "0x8E" ) { - UI::ChangeWidget(`id(`vg), `Enabled, true); - UI::ChangeWidget(`id(`mount_point), `Value, ""); - UI::ChangeWidget(`id(`mount_point), `Enabled, false); // FIXME: does not work. Don't know why - } else { - UI::ChangeWidget(`id(`vg), `Enabled, false); - UI::ChangeWidget( `mount_point, `Enabled, true ); - } - } - if ( UI::QueryWidget(`id(`sizeopt), `CurrentButton) == `max - || UI::QueryWidget(`id(`sizeopt), `CurrentButton) == `auto - || (UI::QueryWidget(`id(`sizeopt), `CurrentButton) == `reuse && UI::QueryWidget(`id(`resize), `Value) == false) - ) - { - UI::ChangeWidget(`id(`partsize) , `Enabled, false); - UI::ChangeWidget(`id(`partsize) , `Value, ""); - } else if( UI::QueryWidget(`id(`sizeopt), `CurrentButton) == `reuse ) { - UI::ChangeWidget(`id(`partsize) , `Enabled, true ); - UI::ChangeWidget(`id(`resize), `Enabled, true ); - } else - { - UI::ChangeWidget(`id(`partsize) , `Enabled, true); - } - - - if( UI::QueryWidget(`id(`format), `CurrentButton) == `format_true ) - { - symbol filesystem = (symbol)UI::QueryWidget(`id(`fs), `Value); - map selected_fs = file_systems[filesystem]:$[]; - - - return_value = add( return_value , "format", true ); - return_value = add( return_value , "filesystem", filesystem ); - - if ( !pdisk_disk ) - { - return_value = add( return_value , "partition_id", selected_fs[`fsid]:131 ); - } - - string mount = (string) UI::QueryWidget( `id(`mount_point), `Value); - string subStr = substring( String::CutBlanks(mount) , 0,1 ); - return_value = add( return_value , "mount" , mount); - not_used_mountpoints = notUsedMountpoints( getTargets(), selected_fs[`mountpoints]:[]); - - if( filesystem == `swap ) - { - not_used_mountpoints = add( not_used_mountpoints , "swap" ); - if( mount != "" && mount != "swap" ) - { - return_value = add (return_value , "mount" , "swap" ); - UI::ReplaceWidget(`id(`mount_dlg_rp), MountDlg( return_value ,not_used_mountpoints)); - } - if( mount == "" ) - { - UI::ReplaceWidget(`id(`mount_dlg_rp), MountDlg( return_value ,not_used_mountpoints)); - } - } - else - { - if( mount == "swap" || mount == "") - { - if( mount == "swap") - return_value = add (return_value , "mount" ,GetMountPointProposal( getTargets(), [] ) ); - - UI::ReplaceWidget(`id(`mount_dlg_rp), MountDlg( return_value, not_used_mountpoints )); - } - } - - - ChangeExistingSymbolsState( [ `mount_point, `fs ], true); - UI::ChangeWidget(`id(`fsid_point) , `Value , selected_fs[`fsid_item]:""); - UI::ChangeWidget(`id(`fsid_point) , `Enabled, false); - UI::ChangeWidget(`id(`fs_options) , `Enabled, (selected_fs[`options]:[] != [] )); - if( selected_fs[`crypt]:false) - { - UI::ChangeWidget(`id(`crypt_fs) , `Enabled, true); - } - else - { - UI::ChangeWidget(`id(`crypt_fs) , `Enabled, false); - UI::ChangeWidget(`id(`crypt_fs), `Value, false ); - } - - if( filesystem != last_option_fs ) - { - fs_options = $[]; - } - last_option_fs = filesystem; - - if( ret == `fs_options ) - { - fs_options = FileSystemOptions( (map<any, map <string, any> >)fs_options, selected_fs ); - } - else if( ret == `fstab_options ) - { - return_value = FstabOptions ((map<string, any>)$[], return_value); - y2milestone("fstab %1", return_value); - } - - } - else - { - map fs_options = $[]; - list set_true = [ `fsid_point ]; - - if(pdisk_disk ) set_true = []; - - list set_false = [ `crypt_fs, `fs, `fs_options]; - // list set_false = [ `crypt_fs, `fs]; - -// if( create ) set_false = add( set_false, `mount_point ); -// else set_true = add( set_true , `mount_point ); - - ChangeExistingSymbolsState( set_true ,true ); - ChangeExistingSymbolsState( set_false ,false ); - - UI::ChangeWidget(`id(`crypt_fs), `Value, false ); - - return_value = filter (string k, any v , return_value , ``( k != "filesystem" && k != "fs_options")); - string fs_string = (string) UI::QueryWidget(`id(`fsid_point ) , `Value); - fs_string = substring( fs_string, 0, 4 ); - integer fs_int = tointeger( fs_string ); - - if( fs_int >= 0 && fs_int <= 255 ) - { - return_value = add( return_value, "format", false ); - return_value = add( return_value, "partition_id", fs_int ); - if( create ) - { - return_value = add( return_value, "filesystem", `unknown); - } - } - else - { - Report::Warning(_("The partition ID must be between 0x00 and 0xff.")); - UI::SetFocus(`id(`fsid_point)); - continue; - } - if( ret == `fstab_options ) - { - return_value = FstabOptions ((map<string, any>)$[], return_value); - return_value = remove(return_value, "ori_fstopt"); - y2milestone("fstab %1", return_value); - } - } - } - else - { - break; - } - - if ( ret == `ok ) - { - if ((symbol) UI::QueryWidget(`id(`sizeopt), `CurrentButton) == `max ) - { - // Check if a partition already was configured with "max" size - if (CheckIfMaxSet(drive) && mode != `edit) - { - Popup::Error(_("No additional partitions can be added. -The last partition created ends at the disk boundaries -due to use of the \"max\" option. -")); - continue; - } - return_value= add(return_value,"size","max"); - } - else if ((symbol) UI::QueryWidget(`id(`sizeopt), `CurrentButton) == `auto ) - { - return_value = add(return_value,"size","auto"); - } - else - { - if( haskey( return_value, "size" ) ) - return_value = remove( return_value, "size" ); - string partitionSize = (string) UI::QueryWidget(`id(`partsize), `Value); - string partitionNr = (string) UI::QueryWidget(`id(`partition_nr), `Value); - if ( partitionSize == "" && partitionNr == "" && !(boolean)UI::QueryWidget(`id(`reuse), `Value) ) - { - Report::Warning(_("Enter the partition size or a partition number.")); - continue; - } - else if( partitionNr == "" && (boolean)UI::QueryWidget(`id(`reuse), `Value) ) { - Report::Warning(_("To reuse a partition, the partition number is required.")); - continue; - } - else if( partitionSize != "" ) - { - return_value=add(return_value,"size", partitionSize); - } - } - - string pnr = (string)UI::QueryWidget(`id(`partition_nr), `Value); - if ( pnr != "" ) { - return_value = add(return_value, "partition_nr" , tointeger(pnr) ); - string partitionSize = (string) UI::QueryWidget(`id(`partsize), `Value); - if( partitionSize == "" ) { - return_value = add(return_value, "create" , false ); - } - } - - - if ((boolean)UI::QueryWidget(`id(`asprimary), `Value)) - { - return_value= add(return_value, "partition_type" ,"primary"); - } - - // save mountpoint - if ( create && (! return_value["format"]:true)) - { - return_value["mount"] = ""; - } - else - { - return_value["mount"] = String::CutBlanks( (string)UI::QueryWidget(`id(`mount_point), `Value)); - } - - // add fstype to return_value - if ( !pdisk_disk ) - { - integer fs_id = return_value["partition_id"]:0; - if (haskey(return_value, "fsid")) - { - return_value = remove (return_value,"fsid"); - } - } - - - if( !check_crypt_fs_mount_points(return_value["mount"]:"", - (boolean)UI::QueryWidget(`id(`crypt_fs), `Value ) )) - { - UI::SetFocus(`id(`mount_point)); - continue; - } - - if( (boolean)UI::QueryWidget(`id(`vg), `Enabled) ) { - string vg = (string)UI::QueryWidget(`id(`vg), `Value); - list<map> partitioning = AutoinstStorage::AutoPartPlan; - foreach( map d, partitioning, ``{ - if( d["type"]:`x == `CT_LVM && d["device"]:"" == "/dev/"+vg ) { - return_value = add( return_value, "lvm_group", vg ); - } - }); - } - - if( (boolean)UI::QueryWidget(`id(`lv_name), `Enabled) ) { - return_value = add( return_value, "lv_name", (string)UI::QueryWidget(`id(`lv_name), `Value) ); - } - - // crypto settings - boolean crypt_fs = (boolean)UI::QueryWidget(`id(`crypt_fs), `Value ); - return_value = add( return_value, "crypt_fs", crypt_fs ); - return_value = add( return_value, "crypt", "twofish256" ); - - if ( crypt_fs ) - { - string fs_passwd = DlgCreateCryptFs("", 20, true, false); - // Ask the user for a password for cryptofs, else set crypto to nil?? - if ( fs_passwd != nil ) - { - return_value = add( return_value, "crypt_key", fs_passwd); - } - else - { - ret = `retry; - UI::ChangeWidget(`id(`crypt_fs), `Value, false); - } - } - - if( UI::QueryWidget(`id(`resize), `Value) == true && (symbol) UI::QueryWidget(`id(`sizeopt), `CurrentButton) == `reuse ) { - return_value = add( return_value, "resize", true ); - return_value["create"] = false; - } else { - return_value = add( return_value, "resize", false ); - } - - y2milestone("fs options: %1", fs_options); - if ( fs_options != $[] && return_value["format"]:false ) - { - return_value = add( return_value, "fs_options", fs_options); - } - else - { - return_value = filter(string key, any value, return_value, ``( key != "fs_options")); - } - break; - } - - } - - UI::CloseDialog(); - - if ( ret != `cancel ) - { - list partitions = this_drive["partitions"]:[]; - if (mode == `create) - { - partitions=add(partitions,return_value); - } - else if (mode == `edit) - { - partitions[tointeger(item_id[1]:"") - 1] = return_value; - } - this_drive["partitions"] = partitions; - - AutoinstStorage::AutoPartPlan = add (other_drives, this_drive); - } - return (symbol)ret; - } - - /* - * Create VG dialog - * @param mode mode of operation - * @param item item to edit - * @return symbol - */ - define symbol VGDialog(symbol mode, string item) - ``{ - - string vg_name = ""; - if ( size(item) > 0 ) { - vg_name = item; - } - - list<map> drives = AutoinstStorage::AutoPartPlan; - list configured_vgs = []; - map current_drive = $[]; - boolean is_lvm_vg = false; - foreach( map d, drives, ``{ - if( d["type"]:`x == `CT_LVM ) - configured_vgs = add(configured_vgs, d["device"]:""); - if( d["device"]:"" == vg_name ) { - current_drive = d; - if( d["type"]:`x == `CT_LVM ) { - is_lvm_vg = true; - } - } - }); - map drive = $[]; - string help = _(" -<P> -Create and edit your volume groups here. After that, assign physical partitions to this volume group in the partition dialog of a physical hard disk. Set the partition ID to 0x8e for those partitions. -</P> -"); - string title = _("Configure Volume Groups"); - term contents = - `Top( - `VBox( - `Left( - `TextEntry(`id(`vg_name), `opt(`editable), _("&Volume Group"), vg_name ) - ), - `VSpacing(1), - `RadioButtonGroup( `id(`bgroup2), - `VBox( - `Left(`RadioButton(`id(`is_lvm_vg), `opt(`notify), - "&LVM Volume Group", is_lvm_vg - ) - ) - ) - ) - ) - ); - - - Wizard::CreateDialog(); - string help_text = _("Help"); - Wizard::SetContents( title, contents, help, true , true ); - Wizard::HideAbortButton(); - - any ret = nil; - repeat { - ret = UI::UserInput(); - - if (ret == `next) - { - string vg_name = (string) UI::QueryWidget(`id(`vg_name),`Value); - symbol vg_type = (symbol) UI::QueryWidget(`id(`bgroup2), `CurrentButton); - if (mode == `create) - { - if (!contains(configured_vgs,"/dev/"+vg_name)) { - drive=add(drive, "use","all"); - drive=add(drive, "type",`CT_LVM); - drive=add(drive, "pesize","4M"); - drive=add(drive, "device","/dev/"+vg_name); - - drives=add(drives,drive); - AutoinstStorage::AutoPartPlan = drives; - } - else - { - Popup::Message(_("This volume group is already configured. -Select or enter another name. -")); - continue; - } - } else { - //remove current drive from list - drives=filter(map d, drives,``(d["device"]:"" != vg_name)); - - current_drive["type"] = `CT_LVM; - current_drive["use"] = "all"; - current_drive["device"] = vg_name; - drives=add(drives,current_drive); - AutoinstStorage::AutoPartPlan = drives; - } - } - } until (ret == `next || ret ==`abort || ret == `back); - Wizard::CloseDialog(); - return (symbol)ret; - - - } - - - /* - * Create Drive dialog - * @param mode mode of operation - * @param item item to edit - * @return symbol - */ - define symbol DriveDialog(symbol mode, string item) - ``{ - - list<string> devices = ["auto", "/dev/hda", "/dev/hdb", "/dev/hdc", "/dev/sda","/dev/sdb"]; - if (issubstring(item, "dev")) { - devices=add(devices, item); - } - - list<map> drives = AutoinstStorage::AutoPartPlan; - list configured_drives = maplist(map c, drives, ``{ - return(c["device"]:"***"); - }); - - if (item == nil || item == "") { - item = "none"; - } - map current_drive = (map)select(filter(map d, drives,``(d["device"]:"" == item)), 0, $[]); - boolean usefree = (current_drive["use"]:"" == "free"); - boolean init = current_drive["initialize"]:false; - - boolean reuse_all = (current_drive["use"]:"" == "all"); - list<string> partitions = splitstring(current_drive["use"]:"", ","); - - if (filterchars(partitions[0]:"", "1234567890") != partitions[0]:"") - partitions = []; - - map drive = $[]; - if (!(usefree || reuse_all || size(partitions)>0)) { - reuse_all = true; - } - - string help = _(" -<P> -Specify the drive name to configure -and how the partitioning should be performed. -</P> -<P> -For more information, consult the documentation. -</P> -"); - string title = _("Configure Drives"); - term contents = - `Top( - `VBox( - `Left( - `ComboBox(`id(`target), - `opt(`editable), - _("&Drive"), - maplist(string dd, toset(devices), ``{ - return(`item(`id(dd), dd, ((dd == item) ? true : false))); - }) - ) - ), - `VSpacing(1), - `RadioButtonGroup( `id(`bgroup2), - `VBox( - `Left(`RadioButton(`id(`usefree),`opt(`notify), - _("Use available &free space only"), - usefree - ) - ), - `Left(`RadioButton(`id(`reuseall), `opt(`notify), - _("&Reuse all existing partitions"), - reuse_all - ) - ), - `Left(`RadioButton(`id(`reuselisted),`opt(`notify), - _("&Use the following (comma separated) partitions"), - (size(partitions)>0) - ) - ) - ) - ), - - `HBox( - `HSpacing(1), - `Left( - `TextEntry( - `id(`reuse_partitions), - _("&Partition Numbers (i.e., 3,4,5)"), - mergestring(partitions, ",") - ) - ) - ), - `VSpacing(1), - `Left(`CheckBox(`id(`init), _("Initialize hard dri&ve"), init)) - ) - ); - - - Wizard::CreateDialog(); - string help_text = _("Help"); - Wizard::SetContents( title, contents, help, true , true ); - Wizard::HideAbortButton(); - - - if (size(partitions)>0) - { - UI::ChangeWidget(`id(`reuse_partitions), `Enabled, true); - } - else - { - UI::ChangeWidget(`id(`reuse_partitions), `Enabled, false); - } - - any ret = nil; - repeat { - ret = UI::UserInput(); - - if ( (symbol)UI::QueryWidget(`id(`bgroup2), `CurrentButton) != `reuselisted) - UI::ChangeWidget(`id(`reuse_partitions), `Enabled, false); - else - UI::ChangeWidget(`id(`reuse_partitions), `Enabled, true); - - if (ret == `next) - { - string device = (string) UI::QueryWidget(`id(`target),`Value); - symbol driveopts = (symbol) UI::QueryWidget(`id(`bgroup2), `CurrentButton); - string usewhat = ""; - if (mode == `create) - { - if (!contains(configured_drives,device)) { - drive=add(drive, "device",device); - - if (driveopts == `reuseall) - usewhat = "all"; - else if (driveopts == `reuselisted) - usewhat = (string) UI::QueryWidget(`id(`reuse_partitions), `Value); - else if (driveopts == `usefree) - usewhat = "free"; - else if (driveopts == `uselinux) - usewhat = "linux"; - - if (usewhat !="") - drive["use"] = usewhat; - - if ((boolean) UI::QueryWidget(`id(`init), `Value)) - drive["initialize"] = true; - else - drive["initialize"] = false; - - - drives=add(drives,drive); - AutoinstStorage::AutoPartPlan = drives; - } - else - { - Popup::Message(_("This device is already configured. -Select or enter another device name. -")); - continue; - } - - } else { - //remove current drive from list - drives=filter(map d, drives,``(d["device"]:"" != item)); - - if (driveopts == `reuseall) - usewhat = "all"; - else if (driveopts == `reuselisted) - usewhat = (string) UI::QueryWidget(`id(`reuse_partitions), `Value); - else if (driveopts == `usefree) - usewhat = "free"; - else if (driveopts == `uselinux) - usewhat = "linux"; - - if (usewhat !="") - current_drive["use"] = usewhat; - - current_drive["device"] = device; - drives=add(drives,current_drive); - AutoinstStorage::AutoPartPlan = drives; - } - } - } until (ret == `next || ret ==`abort || ret == `back); - Wizard::CloseDialog(); - return (symbol)ret; - - - } - - - /** - * Main Partitioning Dialog - * @return symbol - */ - define symbol StorageDialog() - { - - any ret = nil; - any action = nil; - - list drives_table = AutoinstStorage::Overview(); - - term contents = - `VBox( - `Table(`id(`table), `opt(`notify, `immediate, `keepSorting), - `header(_("Device"), _("Mount"), _(" Size "), _(" Type ") ,_(" File System "), _("Region ")), - drives_table - ), - `HBox( - `PushButton(`id(`drive), _("Add Dri&ve")), - `PushButton(`id(`addVG), _("Add Volume Group")), - `PushButton(`id(`part), _("Add &Partition")), - `PushButton(`id(`edit), _("&Edit")), - `PushButton(`id(`delete), _("&Delete")) - ) - ); - - Wizard::SetContents(_("Partition Plans"), - contents , HELPS["drivedialog"]:"", true, true); - - Wizard::HideAbortButton(); - - Wizard::SetNextButton(`next, Label::FinishButton() ); - - while (true) - { - /* - string item = (string)UI::QueryWidget(`id(`table), `CurrentItem); - - y2milestone("item: %1", item); - if (item == nil ) - { - UI::ChangeWidget(`id(`delete), `Enabled, false); - UI::ChangeWidget(`id(`edit), `Enabled, false); - continue; - } - else - { - list whatitem = (list)splitstring(item,":"); - if (size(whatitem) >1) - { //Partition - UI::ChangeWidget(`id(`part), `Enabled, false); - } - } - */ - ret = UI::UserInput(); - - string item = (string) UI::QueryWidget(`id(`table), `CurrentItem); - - list<map> drives = AutoinstStorage::AutoPartPlan; - list configured_drives = maplist(map c, drives, ``{ - return(c["device"]:""); - }); - - - if (contains(configured_drives, item)) - { - UI::ChangeWidget(`id(`part), `Enabled, true); - } - else - { - UI::ChangeWidget(`id(`part), `Enabled, false); - } - - - list whatitem = []; - - if(item != nil) { - whatitem = splitstring( item , ":"); - } - - if (ret == `table && size (whatitem) == 0) { - UI::ChangeWidget(`id(`delete), `Enabled, true); - UI::ChangeWidget(`id(`edit), `Enabled, true); - } else if (ret == `drive) { - action = DriveDialog(`create, "" ); - drives_table = AutoinstStorage::Overview(); - UI::ChangeWidget(`id(`table), `Items, drives_table); - } else if (ret == `addVG) { - action = VGDialog(`create, "" ); - drives_table = AutoinstStorage::Overview(); - UI::ChangeWidget(`id(`table), `Items, drives_table); - } else if (ret == `part) { - if (item != nil) - { - // Check if a partition already was configured with "max" size - if (CheckIfMaxSet((string)item)) - { - Popup::Error(_("No additional partitions can be added. -The last partition created ends at the disk boundaries -due to use of the \"max\" option. -")); - continue; - } - action = PartitionDialog(`create, item); - UI::ChangeWidget(`id(`table), `CurrentItem, item); - } - else - { - Popup::Message(_("Select a drive first.")); - continue; - } - - drives_table = AutoinstStorage::Overview(); - UI::ChangeWidget(`id(`table), `Items, drives_table); - } - else if (ret == `edit) - { - list item_id = splitstring(item,":"); - if (size(item_id) >1) { //Partition - action = PartitionDialog(`edit, item); - UI::ChangeWidget(`id(`table), `CurrentItem, item_id[0]:""); - UI::ChangeWidget(`id(`part), `Enabled, true); - } else { - list<map> partitioning = AutoinstStorage::AutoPartPlan; - map this_drive = $[]; - this_drive = select (filter (map d, partitioning, - ``(d["device"]:"" == item_id[0]:"")), 0, $[] ); - if( this_drive["type"]:`x == `CT_LVM ) { - action = VGDialog(`edit, (string) item ); - } else { - action = DriveDialog(`edit, (string) item ); - } - } - drives_table = AutoinstStorage::Overview(); - UI::ChangeWidget(`id(`table), `Items, drives_table); - } - else if (ret == `delete) - { - list<map> partitioning = AutoinstStorage::AutoPartPlan; - list<string> item_id = splitstring(item,":"); - map this_drive = $[]; - string drive = ""; - - if (size(item_id)>1) { //Partition - this_drive = - (map)select(filter(map d, - partitioning, - ``(d["device"]:"" == item_id[0]:"")), - 0, - $[] - ); - drive= (string)item_id[0]:""; - list drive_partitions = this_drive["partitions"]:[]; - - drive_partitions= remove(drive_partitions, tointeger(item_id[1]:"") - 1); - - this_drive["partitions"] = drive_partitions; - - AutoinstStorage::AutoPartPlan= maplist(map d, partitioning, - ``{ - if (d["device"]:"" == drive) - { - return(this_drive); - } - else - { - return(d); - } - }); - } - else - { - AutoinstStorage::AutoPartPlan = filter(map d,partitioning,``(d["device"]:"" != item)); - } - drives_table = AutoinstStorage::Overview(); - UI::ChangeWidget(`id(`table), `Items, drives_table); - } - else if (ret == `next || ret == `back || ret == `cancel ) - { - break; - } - - - - } - - return (symbol)ret; - } - -// EOF -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.24.3/src/include/io.ycp new/autoyast2-2.24.4/src/include/io.ycp --- old/autoyast2-2.24.3/src/include/io.ycp 2013-04-30 19:21:32.000000000 +0200 +++ new/autoyast2-2.24.4/src/include/io.ycp 2013-07-17 15:36:45.000000000 +0200 @@ -72,7 +72,12 @@ string tmp_dir = (string)WFM::Read(.local.tmpdir, []); string mount_point = tmp_dir + "/tmp_mount"; - WFM::Execute(.local.mkdir, mount_point ); + string mp_in_local = mount_point; + string chr = WFM::SCRGetName(WFM::SCRGetDefault()); + if( search(chr,"chroot=/mnt:")==0 ) + mp_in_local = AutoinstConfig::destdir+mount_point; + y2milestone( "Chr:%3 TmpDir:%1 Mp:%2", tmp_dir, mp_in_local, chr ); + WFM::Execute(.local.mkdir, mp_in_local ); if ( Scheme == "http" || Scheme == "https" ) { @@ -188,11 +193,6 @@ } else if (Scheme == "nfs") // NFS { - if (Installation::boot () != "nfs") - { - y2milestone("Starting portmap: %1", SCR::Execute (.target.bash, "/sbin/portmap") ); - } - if( !(boolean)SCR::Execute(.target.mount, [ Host + ":" + dirname(Path), mount_point ], "-o noatime,nolock" ) && !(boolean)SCR::Execute(.target.mount, [ Host + ":" + dirname(Path), mount_point ], "-o noatime -t nfs4" ) ) { @@ -202,7 +202,7 @@ return (false); } - string copyCmd = "/bin/cp " + mount_point + "/" + basename(Path) + + string copyCmd = "/bin/cp " + mp_in_local + "/" + basename(Path) + " " + Localfile; y2milestone("Copy Command: %1", copyCmd); if (WFM::Execute (.local.bash, copyCmd ) == 0) @@ -219,7 +219,7 @@ } - WFM::Execute(.local.umount, mount_point); + SCR::Execute(.target.umount, mount_point); } else if (Scheme == "cifs") // CIFS @@ -233,7 +233,7 @@ return (false); } - string copyCmd = "/bin/cp " + mount_point + "/" + basename(Path) + + string copyCmd = "/bin/cp " + mp_in_local + "/" + basename(Path) + " " + Localfile; y2milestone("Copy Command: %1", copyCmd); if (WFM::Execute (.local.bash, copyCmd ) == 0) @@ -250,7 +250,7 @@ } - WFM::Execute(.local.umount, mount_point); + SCR::Execute(.target.umount, mount_point); } else if (Scheme == "floppy") @@ -367,6 +367,8 @@ y2error("Protocol not supported"); ok = false; } + if( !isempty(GET_error) ) + y2warning("GET_error:%1",GET_error); return ( ok ); } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
