Hello community, here is the log from the commit of package yast2-storage for openSUSE:13.1 checked in at 2013-10-09 08:51:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1/yast2-storage (Old) and /work/SRC/openSUSE:13.1/.yast2-storage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-storage" Changes: -------- --- /work/SRC/openSUSE:13.1/yast2-storage/yast2-storage.changes 2013-10-08 13:57:08.000000000 +0200 +++ /work/SRC/openSUSE:13.1/.yast2-storage.new/yast2-storage.changes 2013-10-09 08:51:23.000000000 +0200 @@ -1,0 +2,49 @@ +Tue Oct 01 15:03:23 CEST 2013 - [email protected] + +- disabled writing storage controller modules to + /etc/sysconfig/kernel (bnc#615467) +- version 3.0.6 + +------------------------------------------------------------------- +Tue Oct 01 14:33:59 CEST 2013 - [email protected] + +- install package open-iscsi if the system has iSCSI (bnc#842740) + +------------------------------------------------------------------- +Mon Sep 30 16:54:55 CEST 2013 - [email protected] + +- fixed disabling of encryption for btrfs (bnc#842783) + +------------------------------------------------------------------- +Mon Sep 30 11:50:42 CEST 2013 - [email protected] + +- removed some logging (bnc#842440) + +------------------------------------------------------------------- +Thu Sep 26 17:04:39 CEST 2013 - [email protected] + +- fix subvol handling for formatted existing root partitions + (bnc#842505) + +------------------------------------------------------------------- +Wed Sep 25 17:12:42 CEST 2013 - [email protected] + +- version 3.0.5 +- add code to support named raids (fate#315590) + +------------------------------------------------------------------- +Wed Sep 25 14:13:07 CEST 2013 - [email protected] + +- removed popup asking for btrfs as default (bnc#839700) + +------------------------------------------------------------------- +Wed Sep 25 11:32:37 CEST 2013 - [email protected] + +- fix sort order in SetTarget map (problem with in autoyast usage) + +------------------------------------------------------------------- +Tue Sep 24 17:48:43 CEST 2013 - [email protected] + +- fixed moving partitions (bnc#841924) + +------------------------------------------------------------------- Old: ---- yast2-storage-3.0.4.tar.bz2 New: ---- yast2-storage-3.0.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.mv7ZAz/_old 2013-10-09 08:51:23.000000000 +0200 +++ /var/tmp/diff_new_pack.mv7ZAz/_new 2013-10-09 08:51:23.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-storage # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,45 +17,33 @@ Name: yast2-storage -Version: 3.0.4 +Version: 3.0.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-storage-%{version}.tar.bz2 -BuildRequires: docbook-xsl-stylesheets -BuildRequires: doxygen -BuildRequires: gcc-c++ -BuildRequires: libstorage-devel >= 2.24.0 -BuildRequires: libstorage-ruby >= 2.24.3 -BuildRequires: libtool -BuildRequires: libxslt -BuildRequires: perl-XML-Writer -BuildRequires: rubygem-ruby-dbus -BuildRequires: sgml-skel -BuildRequires: update-desktop-files -BuildRequires: yast2 >= 2.19.4 -BuildRequires: yast2-core-devel >= 2.23.1 -BuildRequires: yast2-devtools + +Group: System/YaST +License: GPL-2.0 +BuildRequires: gcc-c++ libtool +BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files +BuildRequires: libstorage-devel >= 2.24.0 yast2 >= 2.19.4 yast2-devtools yast2-core-devel >= 2.23.1 BuildRequires: yast2-testsuite >= 2.19.0 -Requires: libstorage-ruby >= 2.24.3 -Requires: libstorage4 >= 2.24.3 +BuildRequires: rubygem-ruby-dbus +BuildRequires: libstorage-ruby >= 2.24.3 +Requires: libstorage4 >= 2.24.5 +Requires: libstorage-ruby >= 2.24.5 +Requires: yast2-core >= 2.18.3 yast2 >= 2.19.4 yast2-libyui >= 2.18.7 Requires: rubygem-ruby-dbus -Requires: yast2 >= 2.19.4 -Requires: yast2-core >= 2.18.3 -Requires: yast2-libyui >= 2.18.7 %ifarch s390 s390x Requires: yast2-s390 %endif PreReq: %fillup_prereq -Provides: y2a_fdsk -Provides: yast2-config-disk -Obsoletes: y2a_fdsk -Obsoletes: yast2-config-disk -Provides: yast2-agent-fdisk -Provides: yast2-agent-fdisk-devel -Obsoletes: yast2-agent-fdisk -Obsoletes: yast2-agent-fdisk-devel +Provides: y2a_fdsk yast2-config-disk +Obsoletes: y2a_fdsk yast2-config-disk +Provides: yast2-agent-fdisk yast2-agent-fdisk-devel +Obsoletes: yast2-agent-fdisk yast2-agent-fdisk-devel Provides: yast2-trans-inst-partitioning Obsoletes: yast2-trans-inst-partitioning Provides: y2t_inst-partitioning @@ -63,8 +51,6 @@ Requires: yast2-ruby-bindings >= 1.0.0 Summary: YaST2 - Storage Configuration -License: GPL-2.0 -Group: System/YaST %description This package contains the files for YaST2 that handle access to disk @@ -147,9 +133,8 @@ %{_prefix}/lib/YaST2/bin/check.boot %package devel -Requires: libstdc++-devel -Requires: yast2-storage = %version Requires: libstorage-devel = %(echo `rpm -q --queryformat '%{VERSION}' libstorage-devel`) +Requires: libstdc++-devel yast2-storage = %version Summary: YaST2 - Storage Library Headers and Documentation Group: Development/Libraries/YaST @@ -162,5 +147,3 @@ %defattr(-,root,root) %doc %{_prefix}/share/doc/packages/yast2-storage/autodocs %doc %{_prefix}/share/doc/packages/yast2-storage/config.xml.description - -%changelog ++++++ yast2-storage-3.0.4.tar.bz2 -> yast2-storage-3.0.6.tar.bz2 ++++++ ++++ 1703 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-3.0.4/Makefile.am new/yast2-storage-3.0.6/Makefile.am --- old/yast2-storage-3.0.4/Makefile.am 2013-09-17 10:57:08.000000000 +0200 +++ new/yast2-storage-3.0.6/Makefile.am 2013-10-08 14:10:26.000000000 +0200 @@ -150,8 +150,10 @@ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ - newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + if [ -f "$$i" ]; then \ + newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + fi \ done package: check-up-to-date check-tagversion check-textdomain package-local diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-3.0.4/Makefile.am.common new/yast2-storage-3.0.6/Makefile.am.common --- old/yast2-storage-3.0.4/Makefile.am.common 2013-09-17 10:57:08.000000000 +0200 +++ new/yast2-storage-3.0.6/Makefile.am.common 2013-10-08 14:10:26.000000000 +0200 @@ -1,63 +1,5 @@ # Makefile.am.common -*- Makefile -*- # Generated file, do not edit! -modulebin_DATA = $(patsubst %.ycp,%.ybc,$(module_DATA)) -modulebindir = $(moduledir) - -ybcfiles = $(filter %.ybc,$(modulebin_DATA)) - -# suffix mapping: info '(make)Static Usage' -# apply only to our modules, not external ones -${ybcfiles}: %.ybc: %.ycp $(ycpchook) - Y2DIR=$(YCPC_Y2DIR) LD_LIBRARY_PATH=$(YCPC_LD_LIBRARY_PATH) ${YCPC} -c -M. -I. -q $(YCPCFLAGS) $< - -# files to clean -CLEANFILES = ${ybcfiles} -DISTCLEANFILES = .dep - -if HAS_YCP_MODULES -# Needs to be outside "." because of cases -# where ycpchook contains a symlink to "." -# Otherwise "." keeps being newer than .dep and we loop. -NEWDEP=${top_builddir}/.dep.new -# generate dependencies -# two steps not to lose the file if the command fails -# hook: create the links before we look for files -.dep: $(wildcard *.ycp) ${ycpchook} - ${YCPMAKEDEP} --prefix=${prefix} ${YCPCFLAGS} > ${NEWDEP} - cat ${NEWDEP} > .dep - rm ${NEWDEP} --include .dep -endif - -dist-hook: check-syntax - -CHECK_SYNTAX = true -check-syntax: $(client_DATA) $(module_DATA) $(ynclude_DATA) $(ydata_DATA) $(ycpchook) $(ybcfiles) - @if test "$(filter %.ycp, $(client_DATA) $(ydata_DATA))"; then \ - if $(CHECK_SYNTAX); then \ - TO_CHECK="$(filter %.ycp, $(client_DATA) $(ydata_DATA))"; \ - echo "Checking syntax of $${TO_CHECK}"; \ - if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \ - echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ - exit 1; \ - fi; \ - else \ - echo "Syntax check disabled"; \ - fi; \ - fi - @if test "$(filter %.rb, $^)"; then \ - if $(CHECK_SYNTAX); then \ - TO_CHECK="$(filter %.rb, $^)"; \ - echo "Checking syntax of $${TO_CHECK}"; \ - for f in $${TO_CHECK}; do \ - if ! ruby -c $$f > /dev/null; then \ - echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ - exit 1; \ - fi; \ - done; \ - else \ - echo "Syntax check disabled"; \ - fi; \ - fi - +# Empty do to drop ycp compilation. When all includes of this file will removed, +# then we can remove also this file (otherwise build will fail) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-3.0.4/VERSION new/yast2-storage-3.0.6/VERSION --- old/yast2-storage-3.0.4/VERSION 2013-09-17 10:56:54.000000000 +0200 +++ new/yast2-storage-3.0.6/VERSION 2013-10-08 14:08:37.000000000 +0200 @@ -1 +1 @@ -3.0.4 +3.0.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-3.0.4/configure.ac new/yast2-storage-3.0.6/configure.ac --- old/yast2-storage-3.0.4/configure.ac 2013-09-17 10:57:08.000000000 +0200 +++ new/yast2-storage-3.0.6/configure.ac 2013-10-08 14:10:26.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.ac for yast2-storage dnl -dnl -- This file is generated by y2autoconf 3.0.5 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 3.1.4 - DO NOT EDIT! -- dnl (edit configure.ac.in or configure.in.in instead) -AC_INIT(yast2-storage, 3.0.4, http://bugs.opensuse.org/, yast2-storage) +AC_INIT(yast2-storage, 3.0.6, http://bugs.opensuse.org/, yast2-storage) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="3.0.4" +VERSION="3.0.6" RPMNAME="yast2-storage" MAINTAINER="Arvin Schnell <[email protected]>" @@ -136,18 +136,6 @@ AC_SUBST(STYLESHEET_YCPDOC) -AC_PATH_PROG(YCPDOC, ycpdoc, false, $PATH:$devtools_ybindir) -if test "$YCPDOC" = "false"; then - AC_MSG_ERROR([ycpdoc is not installed]) -fi -AC_PATH_PROG(YCPMAKEDEP, ycpmakedep, false, $PATH:$devtools_ybindir) -if test "$YCPMAKEDEP" = "false"; then - AC_MSG_ERROR([ycpmakedep is not installed]) -fi -AC_PATH_PROG(YCPC, ycpc, false, $PATH:$bindir) -if test "$YCPC" = "false"; then - AC_MSG_ERROR([ycpc is not installed]) -fi AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [ AC_MSG_WARN([yast2-testsuite.rpm is not installed]) ]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-3.0.4/src/clients/inst_disk_proposal.rb new/yast2-storage-3.0.6/src/clients/inst_disk_proposal.rb --- old/yast2-storage-3.0.4/src/clients/inst_disk_proposal.rb 2013-09-12 14:17:53.000000000 +0200 +++ new/yast2-storage-3.0.6/src/clients/inst_disk_proposal.rb 2013-09-30 17:03:29.000000000 +0200 @@ -86,13 +86,6 @@ @changes = "" if Storage.GetPartProposalFirst - # see bnc#839700 - if Popup.YesNo(_("Would you like to use the next generation\n" + - "Linux file system \"btrfs\" by default?")) - StorageProposal.GetControlCfg() - StorageProposal.SetProposalBtrfs(true) - end - @prop = StorageProposal.get_inst_prop(Storage.GetTargetMap) Builtins.y2milestone("prop ok:%1", Ops.get_boolean(@prop, "ok", false)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-3.0.4/src/clients/inst_prepdisk.rb new/yast2-storage-3.0.6/src/clients/inst_prepdisk.rb --- old/yast2-storage-3.0.4/src/clients/inst_prepdisk.rb 2013-07-30 13:45:30.000000000 +0200 +++ new/yast2-storage-3.0.6/src/clients/inst_prepdisk.rb 2013-09-30 17:03:29.000000000 +0200 @@ -169,6 +169,8 @@ # close progress on running system SlideShow.CloseDialog if Mode.normal + Builtins.y2debug("writing target-map %1", Storage.GetTargetMap) + SCR.Write( path(".target.ycp"), Storage.SaveDumpPath("targetMap_pe"), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-3.0.4/src/clients/storage_finish.rb new/yast2-storage-3.0.6/src/clients/storage_finish.rb --- old/yast2-storage-3.0.4/src/clients/storage_finish.rb 2013-09-17 10:56:54.000000000 +0200 +++ new/yast2-storage-3.0.6/src/clients/storage_finish.rb 2013-10-01 15:05:36.000000000 +0200 @@ -41,7 +41,6 @@ Yast.import "StorageUpdate" Yast.import "Mode" Yast.import "Installation" - Yast.import "Initrd" @ret = nil @func = "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-3.0.4/src/include/partitioning/ep-dialogs.rb new/yast2-storage-3.0.6/src/include/partitioning/ep-dialogs.rb --- old/yast2-storage-3.0.4/src/include/partitioning/ep-dialogs.rb 2013-07-30 13:45:30.000000000 +0200 +++ new/yast2-storage-3.0.6/src/include/partitioning/ep-dialogs.rb 2013-09-30 17:11:59.000000000 +0200 @@ -121,7 +121,7 @@ :crypt_fs, :Enabled, Ops.get_boolean(fs_data, :crypt, true) && - Ops.get_symbol(data, "type", :primary) != :btrfs && + Ops.get_symbol(data, "used_fs", :unknown) != :btrfs && !Ops.get_boolean(data, "pool", false) ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-3.0.4/src/include/partitioning/ep-raid-dialogs.rb new/yast2-storage-3.0.6/src/include/partitioning/ep-raid-dialogs.rb --- old/yast2-storage-3.0.4/src/include/partitioning/ep-raid-dialogs.rb 2013-08-20 15:36:50.000000000 +0200 +++ new/yast2-storage-3.0.6/src/include/partitioning/ep-raid-dialogs.rb 2013-09-30 17:03:29.000000000 +0200 @@ -24,6 +24,7 @@ # Summary: Expert Partitioner # Authors: Arvin Schnell <[email protected]> module Yast + Yast.import "String" module PartitioningEpRaidDialogsInclude def initialize_partitioning_ep_raid_dialogs(include_target) textdomain "storage" @@ -113,6 +114,16 @@ helptext = Ops.add( helptext, _( + "<p><b>Raid Name</b> gives you the possibility to provide a meaningful\n" + + "name for the raid. This is optional. If name is provided, the device is\n" + + "available as <tt>/dev/md/<name></tt>.</p>\n" + ) + ) + + # helptext + helptext = Ops.add( + helptext, + _( "<p>Add partitions to your RAID. According to\n" + "the RAID type, the usable disk size is the sum of these partitions (RAID0), the size\n" + "of the smallest partition (RAID 1), or (N-1)*smallest partition (RAID 5).</p>\n" @@ -174,59 +185,69 @@ Left( # heading HVSquash( - term( - :FrameWithMarginBox, - _("RAID Type"), - RadioButtonGroup( - Id(:raid_type), - VBox( - # Translators, 'Striping' is a technical term here. Translate only if - # you are sure!! If in doubt, leave it in English. - term( - :LeftRadioButton, - Id(:raid0), - Opt(:notify), - _("RAID &0 (Striping)"), - raid_type == "raid0" - ), - # Translators, 'Mirroring' is a technical term here. Translate only if - # you are sure!! If in doubt, leave it in English. - term( - :LeftRadioButton, - Id(:raid1), - Opt(:notify), - _("RAID &1 (Mirroring)"), - raid_type == "raid1" - ), - # Translators, 'Redundant Striping' is a technical term here. Translate - # only if you are sure!! If in doubt, leave it in English. - term( - :LeftRadioButton, - Id(:raid5), - Opt(:notify), - _("RAID &5 (Redundant Striping)"), - raid_type == "raid5" - ), - # Translators, 'Redundant Striping' is a technical term here. Translate only if - # you are sure!! If in doubt, leave it in English. - term( - :LeftRadioButton, - Id(:raid6), - Opt(:notify), - _("RAID &6 (Dual Redundant Striping)"), - raid_type == "raid6" - ), - # Translators, 'Mirroring' and 'Striping' are technical terms here. Translate only if - # you are sure!! If in doubt, leave it in English. - term( - :LeftRadioButton, - Id(:raid10), - Opt(:notify), - _("RAID &10 (Mirroring and Striping)"), - raid_type == "raid10" - ) - ) - ) + HBox( + term( + :FrameWithMarginBox, + _("RAID Type"), + RadioButtonGroup( + Id(:raid_type), + VBox( + # Translators, 'Striping' is a technical term here. Translate only if + # you are sure!! If in doubt, leave it in English. + term( + :LeftRadioButton, + Id(:raid0), + Opt(:notify), + _("RAID &0 (Striping)"), + raid_type == "raid0" + ), + # Translators, 'Mirroring' is a technical term here. Translate only if + # you are sure!! If in doubt, leave it in English. + term( + :LeftRadioButton, + Id(:raid1), + Opt(:notify), + _("RAID &1 (Mirroring)"), + raid_type == "raid1" + ), + # Translators, 'Redundant Striping' is a technical term here. Translate + # only if you are sure!! If in doubt, leave it in English. + term( + :LeftRadioButton, + Id(:raid5), + Opt(:notify), + _("RAID &5 (Redundant Striping)"), + raid_type == "raid5" + ), + # Translators, 'Redundant Striping' is a technical term here. Translate only if + # you are sure!! If in doubt, leave it in English. + term( + :LeftRadioButton, + Id(:raid6), + Opt(:notify), + _("RAID &6 (Dual Redundant Striping)"), + raid_type == "raid6" + ), + # Translators, 'Mirroring' and 'Striping' are technical terms here. Translate only if + # you are sure!! If in doubt, leave it in English. + term( + :LeftRadioButton, + Id(:raid10), + Opt(:notify), + _("RAID &10 (Mirroring and Striping)"), + raid_type == "raid10" + ) + ) + ) + ), + HSpacing(1), + Top( + TextEntry( + Id(:raid_name), + # label text + _("Raid &Name (optional)") + ) + ) ) ) ) @@ -254,6 +275,8 @@ ) MiniWorkflow.SetLastStep(false) + UI.ChangeWidget(Id(:raid_name), :ValidChars, Builtins.deletechars(String.CGraph, "'\"")) + widget = nil begin widget = MiniWorkflow.UserInput @@ -280,8 +303,14 @@ end until widget == :abort || widget == :back || widget == :next if widget == :next - Ops.set(data.value, "raid_type", raid_type) - Ops.set(data.value, "devices", devices) + rname = UI.QueryWidget(Id(:raid_name), :Value) + if !rname.empty? + data.value["device"] = "/dev/md/"+rname + else + data.value["device"] = "/dev/md"+data.value.fetch("nr",0).to_s + end + data.value["raid_type"] = raid_type + data.value["devices"] = devices size_k = 0 size_k_ref = arg_ref(size_k) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-3.0.4/src/include/partitioning/ep-raid-lib.rb new/yast2-storage-3.0.6/src/include/partitioning/ep-raid-lib.rb --- old/yast2-storage-3.0.4/src/include/partitioning/ep-raid-lib.rb 2013-08-12 11:41:49.000000000 +0200 +++ new/yast2-storage-3.0.6/src/include/partitioning/ep-raid-lib.rb 2013-09-30 17:03:29.000000000 +0200 @@ -29,7 +29,7 @@ textdomain "storage" end - def AddDevices(raid_nr, devs) + def AddDevices(raid_dev, devs) devs = deep_copy(devs) ret = true @@ -37,25 +37,25 @@ Storage.SetPartitionId(dev, Partitions.fsid_raid) Storage.SetPartitionFormat(dev, false, :none) end - ret = false if !Storage.ExtendMd(raid_nr, devs) + ret = false if !Storage.ExtendMd(raid_dev, devs) ret end - def RemoveDevices(raid_nr, devs) + def RemoveDevices(raid_dev, devs) devs = deep_copy(devs) ret = true Builtins.foreach(devs) do |dev| Storage.UnchangePartitionId(dev) - ret = false if !Storage.ShrinkMd(raid_nr, [dev]) + ret = false if !Storage.ShrinkMd(raid_dev, [dev]) end ret end - def ReplaceDevices(raid_nr, devs) + def ReplaceDevices(raid_dev, devs) devs = deep_copy(devs) ret = true @@ -63,7 +63,7 @@ Storage.SetPartitionId(dev, Partitions.fsid_raid) Storage.SetPartitionFormat(dev, false, :none) end - ret = false if !Storage.ReplaceMd(raid_nr, devs) + ret = false if !Storage.ReplaceMd(raid_dev, devs) ret end @@ -113,17 +113,15 @@ data = data_ref.value; _DlgCreateRaidNew_result ) - nr = Ops.get_integer(data, "nr", 0) - raid_type = Builtins.tosymbol( - Ops.get_string(data, "raid_type", "raid0") - ) + dev = data.fetch("device","") + raid_type = Builtins.tosymbol(data.fetch("raid_type","raid0")) - if Storage.CreateMdWithDevs(nr, raid_type, []) + if Storage.CreateMdWithDevs(dev, raid_type, []) devices = Ops.get_list(data, "devices", []) - AddDevices(nr, devices) + AddDevices(dev, devices) chunk_size_k = Ops.get_integer(data, "chunk_size_k", 4) - Storage.ChangeMdChunk(nr, chunk_size_k) + Storage.ChangeMdChunk(dev, chunk_size_k) if Builtins.haskey(data, "parity_algorithm") parity_algorithm = Ops.get_symbol( @@ -132,7 +130,7 @@ :par_default ) if( parity_algorithm!=:par_default ) - Storage.ChangeMdParitySymbol(nr, parity_algorithm) + Storage.ChangeMdParitySymbol(dev, parity_algorithm) end end @@ -236,12 +234,11 @@ data = data_ref.value; _DlgResizeRaid_result ) - raid_nr = Ops.get_integer(data, "nr", 0) - + dev = data.fetch("device","") devices_new = Ops.get_list(data, "devices_new", []) Builtins.y2milestone("devices_new:%1", devices_new) if Ops.greater_than(Builtins.size(devices_new), 0) - ReplaceDevices(raid_nr, devices_new) + ReplaceDevices(dev, devices_new) UpdateMainStatus() UpdateNavigationTree(nil) TreePanel.Create diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-3.0.4/src/modules/FileSystems.rb new/yast2-storage-3.0.6/src/modules/FileSystems.rb --- old/yast2-storage-3.0.4/src/modules/FileSystems.rb 2013-08-14 16:17:24.000000000 +0200 +++ new/yast2-storage-3.0.6/src/modules/FileSystems.rb 2013-09-30 17:11:43.000000000 +0200 @@ -29,7 +29,7 @@ # # # $Id$ -require "storage" +require "storage_utf8" require "yast" module Yast diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-3.0.4/src/modules/Partitions.rb new/yast2-storage-3.0.6/src/modules/Partitions.rb --- old/yast2-storage-3.0.4/src/modules/Partitions.rb 2013-08-20 16:21:51.000000000 +0200 +++ new/yast2-storage-3.0.6/src/modules/Partitions.rb 2013-09-30 17:11:43.000000000 +0200 @@ -27,7 +27,7 @@ # Purpose: Provides information about partitions # # $Id$ -require "storage" +require "storage_utf8" require "yast" module Yast diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-3.0.4/src/modules/Storage.rb new/yast2-storage-3.0.6/src/modules/Storage.rb --- old/yast2-storage-3.0.4/src/modules/Storage.rb 2013-09-13 12:41:54.000000000 +0200 +++ new/yast2-storage-3.0.6/src/modules/Storage.rb 2013-10-01 14:39:30.000000000 +0200 @@ -42,7 +42,7 @@ # $Id$ require "yast" require "dbus" -require "storage" +require "storage_utf8" module Yast class StorageClass < Module @@ -2539,7 +2539,7 @@ start, len ) - ret = @sint.updatePartitionArea(device start, len) + ret = @sint.updatePartitionArea(device, start, len) if ret<0 Builtins.y2error("UpdatePartition sint ret:%1", ret) end @@ -2547,6 +2547,7 @@ ret == 0 end + # Sets a mountpoint for partition # # @param [String] device name @@ -2899,7 +2900,7 @@ d = part.fetch("device","") fmt = part.fetch("format",false) rem = part["subvol"].select { |p| p.fetch("delete",false) } - cre = part["subvol"].select { |p| p.fetch("create",false)||fmt } + cre = part["subvol"].select { |p| !p.fetch("delete",false)&&(p.fetch("create",false)||fmt) } Builtins.y2milestone("ChangeVolumeProperties rem:%1", rem) Builtins.y2milestone("ChangeVolumeProperties cre:%1", cre) while ret == 0 && !rem.empty? @@ -3195,11 +3196,22 @@ ret == 0 end + def MdToDev(nr_or_string) + Builtins.y2milestone("MdToDev nr_or:%1", nr_or_string) + if Ops.is_string?(nr_or_string) + ret = nr_or_string + else + ret = "/dev/md"+nr_or_string.to_s + end + Builtins.y2milestone("MdToDev ret:%1", ret) + ret + end + def CreateMd(nr, type) Builtins.y2milestone("CreateMd nr:%1 type:%2", nr, type) tmp = Ops.get(@conv_mdstring, type, 0) empty = ::Storage::ListString.new() - rd = Builtins.sformat("/dev/md%1", nr) + rd = MdToDev(nr) ret = @sint.createMd(rd, tmp, empty, empty) Builtins.y2error("CreateMd sint ret:%1", ret) if ret<0 UpdateTargetMapDisk("/dev/md") @@ -3227,7 +3239,7 @@ end empty = ::Storage::ListString.new() devs = StringListFromList(devices); - rd = Builtins.sformat("/dev/md%1", nr) + rd = MdToDev(nr) ret = @sint.createMd(rd, tmp, devs, empty) if ret<0 Builtins.y2error("CreateMdWithDevs sint ret:%1", ret) @@ -3240,7 +3252,7 @@ Builtins.y2milestone("ReplaceMd nr:%1 devs:%2", nr, devs) empty = ::Storage::ListString.new() devices = StringListFromList(devs); - rd = Builtins.sformat("/dev/md%1", nr) + rd = MdToDev(nr) ret = @sint.updateMd(rd, devices, empty) Builtins.y2error("ReplaceMd sint ret:%1", ret) if ret<0 UpdateTargetMap() @@ -3251,7 +3263,7 @@ Builtins.y2milestone("ExtendMd nr:%1 devs:%2", nr, devs) empty = ::Storage::ListString.new() devices = StringListFromList(devs); - rd = Builtins.sformat("/dev/md%1", nr) + rd = MdToDev(nr) ret = @sint.extendMd(rd, devices, empty) Builtins.y2error("ExtendMd sint ret:%1", ret) if ret<0 UpdateTargetMap() @@ -3262,7 +3274,7 @@ Builtins.y2milestone("ShrinkMd nr:%1 devs:%2", nr, devs) empty = ::Storage::ListString.new() devices = StringListFromList(devs); - rd = Builtins.sformat("/dev/md%1", nr) + rd = MdToDev(nr) ret = @sint.shrinkMd(rd, devices, empty) Builtins.y2error("ShrinkMd sint ret:%1", ret) if ret<0 UpdateTargetMap() @@ -3271,7 +3283,7 @@ def ChangeMdType(nr, mdtype) Builtins.y2milestone("ChangeMdType nr:%1 mdtype:%2", nr, mdtype) - rd = Builtins.sformat("/dev/md%1", nr) + rd = MdToDev(nr) tmp = Ops.get(@conv_mdstring, mdtype, 0) ret = @sint.changeMdType(rd, tmp) Builtins.y2error("ChangeMdType sint ret:%1", ret) if ret<0 @@ -3281,7 +3293,7 @@ def ChangeMdParity(nr, ptype) Builtins.y2milestone("ChangeMdParity nr:%1 parity:%2", nr, ptype) - rd = Builtins.sformat("/dev/md%1", nr) + rd = MdToDev(nr) tmp = Ops.get(@conv_parstring, ptype, 0) ret = @sint.changeMdParity(rd, tmp) if ret<0 @@ -3293,7 +3305,7 @@ def ChangeMdParitySymbol(nr, ptype) Builtins.y2milestone("ChangeMdParitySymbol nr:%1 parity:%2", nr, ptype) - rd = Builtins.sformat("/dev/md%1", nr) + rd = MdToDev(nr) tmp = fromSymbol(@conv_mdparity, ptype) ret = @sint.changeMdParity(rd, tmp) if ret<0 @@ -3305,7 +3317,7 @@ def ChangeMdChunk(nr, chunk) Builtins.y2milestone("ChangeMdChunk nr:%1 chunk:%2", nr, chunk) - rd = Builtins.sformat("/dev/md%1", nr) + rd = MdToDev(nr) ret = @sint.changeMdChunk(rd, chunk) if ret<0 Builtins.y2error("ChangeMdChunk sint ret:%1", ret) @@ -3317,7 +3329,7 @@ def CheckMd(nr) Builtins.y2milestone("CheckMd nr:%1", nr) ret = 0 - rd = Builtins.sformat("/dev/md%1", nr) + rd = MdToDev(nr) ret = @sint.checkMd(rd) Builtins.y2milestone("CheckMd sint ret:%1", ret) if ret != 0 ret @@ -3542,28 +3554,16 @@ Ops.set(p.value, "mountby", mby) end elsif ctype == :CT_MD - ret = CreateMd( - Ops.get_integer(p.value, "nr", 0), - Ops.get_string(p.value, "raid_type", "raid1") - ) - if ret && Builtins.haskey(p.value, "chunk_size") - ChangeMdChunk( - Ops.get_integer(p.value, "nr", 0), - Ops.get_integer(p.value, "chunk_size", 4) - ) - end - if ret && HasRaidParity(Ops.get_string(p.value, "raid_type", "")) && - Builtins.haskey(p.value, "parity_algorithm") - ChangeMdParity( - Ops.get_integer(p.value, "nr", 0), - Ops.get_string(p.value, "parity_algorithm", "") - ) + ret = CreateMd( p.value["device"], p.value.fetch("raid_type","raid1") ) + if ret && p.value.has_key?("chunk_size") + ChangeMdChunk( p.value["device"], p.value.fetch("chunk_size",4) ) + end + if ret && HasRaidParity(p.value.fetch("raid_type","")) && + p.value.has_key?("parity_algorithm") + ChangeMdParity( p.value["device"], p.value.fetch("parity_algorithm","")) end if ret - ret = ExtendMd( - Ops.get_integer(p.value, "nr", 0), - Ops.get_list(p.value, "devices", []) - ) + ret = ExtendMd( p.value["device"], p.value.fetch("devices",[])) end elsif ctype == :CT_LOOP Builtins.y2milestone("CreateAny Loop p:%1", p.value) @@ -4421,12 +4421,12 @@ Builtins.foreach(tmp) do |dev, c| if Ops.get_symbol(c, "type", :CT_UNKNOWN) == :CT_DMRAID && Ops.get_integer(c, "minor", 0) == minor - Builtins.y2milestone("addind bios_id %1 to %2", bios, dev) + Builtins.y2milestone("adding bios_id %1 to %2", bios, dev) Ops.set(tmp, [dev, "bios_id"], bios) end if Ops.get_symbol(c, "type", :CT_UNKNOWN) == :CT_MDPART && Ops.get_string(c, "device", "") == dm - Builtins.y2milestone("addind bios_id %1 to %2", bios, dev) + Builtins.y2milestone("adding bios_id %1 to %2", bios, dev) Ops.set(tmp, [dev, "bios_id"], bios) end end @@ -4693,23 +4693,14 @@ !Ops.get_boolean(p, "delete", false) && Ops.get_boolean(p, "create", false) end - if Ops.greater_than(Builtins.size(dps), 1) && - Builtins.haskey(Ops.get(dps, 0, {}), "nr") - dps = Builtins.sort(dps) do |a, b| - Ops.less_than( - Ops.get_integer(a, "nr", 0), - Ops.get_integer(b, "nr", 0) - ) - end - end - if Ops.greater_than(Builtins.size(dps), 1) && - Builtins.haskey(Ops.get(dps, 0, {}), "name") - dps = Builtins.sort(dps) do |a, b| - Ops.greater_than( - Ops.get_boolean(a, "pool", false), - Ops.get_boolean(b, "pool", false) - ) + if dps.size>1 + Builtins.y2milestone("SetTargetMap dps:%1",dps) + if dps.fetch(0,{}).has_key?("nr") + dps.sort! { |a, b| a.fetch("nr",0)<=>b.fetch("nr",0) } + elsif dps.fetch(0,{}).fetch("type",:none)==:lvm + dps = dps.partition { |a| a.fetch("pool",false) } end + Builtins.y2milestone("SetTargetMap dps:%1",dps) end Builtins.foreach(dps) do |p| p_ref = arg_ref(p) @@ -4897,30 +4888,28 @@ def_subvol.sort!() sv_prepend = "" - Builtins.y2milestone( - "AddSubvolRoot subvol:%1", - Ops.get_list(part, "subvol", []) - ) + lst = part.fetch("subvol",[]) + Builtins.y2milestone("AddSubvolRoot subvol:%1", lst) if FileSystems.default_subvol != "" - sv_prepend = Ops.add(FileSystems.default_subvol, "/") + sv_prepend = FileSystems.default_subvol+"/" end - Builtins.foreach(def_subvol) do |s| - svn = Ops.add(sv_prepend, s) - if Builtins.find(Ops.get_list(part, "subvol", [])) do |p| - Ops.get_string(p, "name", "") == svn - end == nil - Ops.set( - part, - "subvol", - Builtins.add( - Ops.get_list(part, "subvol", []), - { "create" => true, "name" => svn } - ) - ) + fmt = part.fetch("format",false) + names = [] + if !fmt + names = ls.select { |s| !s.fetch("delete",false) }.each { |s| s.fetch("name","") } + else + lst = [] + end + Builtins.y2milestone("AddSubvolRoot subvol names:%1 lst:%2", names, lst) + def_subvol.each do |s| + svn = sv_prepend+s + if !names.include?( svn ) + lst.push( { "create" => true, "name" => svn } ) end end + part["subvol"] = lst; Builtins.y2milestone("AddSubvolRoot part:%1", part) - deep_copy(part) + part end @@ -5805,10 +5794,12 @@ need_nfs = false need_quota = false need_crypt = false + need_iscsi = false Builtins.foreach(target_map) do |k, e| need_lvm = true if Ops.get_symbol(e, "type", :CT_UNKNOWN) == :CT_LVM need_nfs = true if Ops.get_symbol(e, "type", :CT_UNKNOWN) == :CT_NFS + need_iscsi = true if Ops.get_boolean(e, "iscsi", :CT_UNKNOWN) == true if Builtins.find(Ops.get_list(e, "partitions", [])) do |part2| FileSystems.HasQuota(part2) end != nil @@ -5822,58 +5813,42 @@ end Builtins.y2milestone( - "AddPackageList need_lvm:%1 need_nfs:%2 need_quota:%3 need_crypt:%4", - need_lvm, - need_nfs, - need_quota, - need_crypt + "AddPackageList need_lvm:%1 need_nfs:%2 need_quota:%3 need_crypt:%4 need_iscsi:%5", + need_lvm, need_nfs, need_quota, need_crypt, need_iscsi ) if need_lvm - pl = Convert.convert( - Builtins.union(pl, ["lvm2"]), - :from => "list", - :to => "list <string>" - ) + pl << "lvm2" end - #nfs-client needs to be marked for installation if we have - #some NFS shares. It will pull in portmapper package(#436897) + # nfs-client needs to be marked for installation if we have some NFS + # shares. It will pull in portmapper package(#436897) if need_nfs - pl = Convert.convert( - Builtins.union(pl, ["nfs-client", "yast2-nfs-client"]), - :from => "list", - :to => "list <string>" - ) + pl << "nfs-client" << "yast2-nfs-client" end + if need_quota - pl = Convert.convert( - Builtins.union(pl, ["quota"]), - :from => "list", - :to => "list <string>" - ) + pl << "quota" end + if need_crypt - pl = Convert.convert( - Builtins.union(pl, ["cryptsetup", "cryptsetup-mkinitrd", "pam_mount"]), - :from => "list", - :to => "list <string>" - ) + pl << "cryptsetup" << "cryptsetup-mkinitrd" << "pam_mount" + end + + if need_iscsi + pl << "open-iscsi" end part = GetEntryForMountpoint("/") if Ops.get_symbol(part, "used_fs", :unknown) == :btrfs - pl = Convert.convert( - Builtins.union(pl, ["snapper", "yast2-snapper"]), - :from => "list", - :to => "list <string>" - ) + pl << "snapper" << "yast2-snapper" end Builtins.y2milestone("AddPackageList ret %1", pl) deep_copy(pl) end + # Takes care of selecting packages needed by storage # in installation # (replacement for HandlePackages in *_proposal clients) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-3.0.4/src/modules/StorageClients.rb new/yast2-storage-3.0.6/src/modules/StorageClients.rb --- old/yast2-storage-3.0.4/src/modules/StorageClients.rb 2013-08-12 12:21:51.000000000 +0200 +++ new/yast2-storage-3.0.6/src/modules/StorageClients.rb 2013-09-30 17:11:43.000000000 +0200 @@ -26,7 +26,7 @@ # # Purpose: Define callbacks for libstorage. require "yast" -require "storage" +require "storage_utf8" module Yast diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-3.0.4/src/modules/StorageControllers.rb new/yast2-storage-3.0.6/src/modules/StorageControllers.rb --- old/yast2-storage-3.0.4/src/modules/StorageControllers.rb 2013-07-30 13:45:30.000000000 +0200 +++ new/yast2-storage-3.0.6/src/modules/StorageControllers.rb 2013-10-01 15:05:36.000000000 +0200 @@ -39,7 +39,6 @@ Yast.import "Arch" Yast.import "ModuleLoading" Yast.import "HwStatus" - Yast.import "Initrd" Yast.import "Storage" Yast.import "StorageDevices" Yast.import "StorageClients" @@ -396,9 +395,9 @@ end Builtins.y2milestone("Initialize ModToInitrd %1", @ModToInitrd) end - Builtins.foreach(@ModToInitrd) do |s| - Initrd.AddModule(Ops.get_string(s, 0, ""), Ops.get_string(s, 1, "")) - end + # Builtins.foreach(@ModToInitrd) do |s| + # Initrd.AddModule(Ops.get_string(s, 0, ""), Ops.get_string(s, 1, "")) + # end # load all raid personalities SCR.Execute(path(".target.modprobe"), "raid0", "") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-3.0.4/src/modules/StorageInit.rb new/yast2-storage-3.0.6/src/modules/StorageInit.rb --- old/yast2-storage-3.0.4/src/modules/StorageInit.rb 2013-08-12 12:21:51.000000000 +0200 +++ new/yast2-storage-3.0.6/src/modules/StorageInit.rb 2013-09-30 17:11:54.000000000 +0200 @@ -24,7 +24,7 @@ # Authors: Thomas Fehr ([email protected]) # # Purpose: Helper module to initialize libstorage -require "storage" +require "storage_utf8" require "yast" module Yast @@ -70,11 +70,10 @@ Builtins.y2milestone("ro:%1 test:%2 auto:%3 instsys:%4", env.readonly, env.testmode, env.autodetect, env.instsys ) + locker_pid = 0 - Builtins.y2milestone("@sint:%1 pid:%2", @sint, locker_pid ) @sint, locker_pid = ::Storage::createStorageInterfacePid(env) - Builtins.y2milestone("@sint:%1 pid:%2", @sint, locker_pid ) - Builtins.y2milestone("@sint is a %1 int:%2", @sint.class, @sint.kind_of?(Fixnum) ) + if @sint.kind_of?(Fixnum) locker_pid = @sint @sint = nil -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
