Hello community, here is the log from the commit of package yast2-storage for openSUSE:Factory checked in at 2013-09-13 14:51:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-storage (Old) and /work/SRC/openSUSE:Factory/.yast2-storage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-storage" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-storage/yast2-storage.changes 2013-08-27 21:56:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-storage.new/yast2-storage.changes 2013-09-13 14:51:09.000000000 +0200 @@ -1,0 +2,22 @@ +Fri Sep 13 11:45:33 CEST 2013 - [email protected] + +- additional subvolumes for btrfs root (fate#316222) +- version 3.0.3 + +------------------------------------------------------------------- +Thu Sep 12 16:27:56 CEST 2013 - [email protected] + +- fix handling of default subvolumes for root fs when formatting + but not creating a partition + +------------------------------------------------------------------- +Thu Sep 12 12:04:21 CEST 2013 - [email protected] + +- added popup asking for btrfs as default (bnc#839700) + +------------------------------------------------------------------- +Mon Sep 09 13:54:34 CEST 2013 - [email protected] + +- adapted snapper setup to new installer (fate#314695) + +------------------------------------------------------------------- @@ -404 +426 @@ -- add red error text if there is no root fs in storage propopsal +- add red error text if there is no root fs in storage proposal Old: ---- yast2-storage-3.0.2.tar.bz2 New: ---- yast2-storage-3.0.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.Mxo2NG/_old 2013-09-13 14:51:10.000000000 +0200 +++ /var/tmp/diff_new_pack.Mxo2NG/_new 2013-09-13 14:51:10.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-storage -Version: 3.0.2 +Version: 3.0.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-storage-3.0.2.tar.bz2 -> yast2-storage-3.0.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.0.2/VERSION new/yast2-storage-3.0.3/VERSION --- old/yast2-storage-3.0.2/VERSION 2013-08-22 16:56:51.000000000 +0200 +++ new/yast2-storage-3.0.3/VERSION 2013-09-13 11:35:41.000000000 +0200 @@ -1 +1 @@ -3.0.2 +3.0.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.0.2/configure new/yast2-storage-3.0.3/configure --- old/yast2-storage-3.0.2/configure 2013-08-22 17:57:08.000000000 +0200 +++ new/yast2-storage-3.0.3/configure 2013-09-13 12:42:23.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for yast2-storage 3.0.2. +# Generated by GNU Autoconf 2.69 for yast2-storage 3.0.3. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='yast2-storage' PACKAGE_TARNAME='yast2-storage' -PACKAGE_VERSION='3.0.2' -PACKAGE_STRING='yast2-storage 3.0.2' +PACKAGE_VERSION='3.0.3' +PACKAGE_STRING='yast2-storage 3.0.3' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1380,7 +1380,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 yast2-storage 3.0.2 to adapt to many kinds of systems. +\`configure' configures yast2-storage 3.0.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1451,7 +1451,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-storage 3.0.2:";; + short | recursive ) echo "Configuration of yast2-storage 3.0.3:";; esac cat <<\_ACEOF @@ -1569,7 +1569,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-storage configure 3.0.2 +yast2-storage configure 3.0.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2022,7 +2022,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-storage $as_me 3.0.2, which was +It was created by yast2-storage $as_me 3.0.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2961,7 +2961,7 @@ # Define the identity of the package. PACKAGE='yast2-storage' - VERSION='3.0.2' + VERSION='3.0.3' cat >>confdefs.h <<_ACEOF @@ -3084,7 +3084,7 @@ -VERSION="3.0.2" +VERSION="3.0.3" RPMNAME="yast2-storage" MAINTAINER="Arvin Schnell <[email protected]>" @@ -16761,7 +16761,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-storage $as_me 3.0.2, which was +This file was extended by yast2-storage $as_me 3.0.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16827,7 +16827,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-storage config.status 3.0.2 +yast2-storage config.status 3.0.3 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/yast2-storage-3.0.2/configure.ac new/yast2-storage-3.0.3/configure.ac --- old/yast2-storage-3.0.2/configure.ac 2013-08-22 17:56:57.000000000 +0200 +++ new/yast2-storage-3.0.3/configure.ac 2013-09-13 12:42:08.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.ac for yast2-storage dnl -dnl -- This file is generated by y2autoconf 3.0.4 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 3.0.5 - DO NOT EDIT! -- dnl (edit configure.ac.in or configure.in.in instead) -AC_INIT(yast2-storage, 3.0.2, http://bugs.opensuse.org/, yast2-storage) +AC_INIT(yast2-storage, 3.0.3, 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.2" +VERSION="3.0.3" RPMNAME="yast2-storage" MAINTAINER="Arvin Schnell <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.0.2/src/clients/inst_disk_proposal.rb new/yast2-storage-3.0.3/src/clients/inst_disk_proposal.rb --- old/yast2-storage-3.0.2/src/clients/inst_disk_proposal.rb 2013-07-30 13:45:30.000000000 +0200 +++ new/yast2-storage-3.0.3/src/clients/inst_disk_proposal.rb 2013-09-12 14:17:53.000000000 +0200 @@ -85,6 +85,14 @@ @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' old/yast2-storage-3.0.2/src/clients/storage_finish.rb new/yast2-storage-3.0.3/src/clients/storage_finish.rb --- old/yast2-storage-3.0.2/src/clients/storage_finish.rb 2013-07-30 13:45:30.000000000 +0200 +++ new/yast2-storage-3.0.3/src/clients/storage_finish.rb 2013-09-09 13:56:54.000000000 +0200 @@ -93,21 +93,12 @@ if Mode.installation @part = Storage.GetEntryForMountpoint("/") if Ops.get_symbol(@part, "used_fs", :unknown) == :btrfs - Builtins.y2milestone("configuring snapper") - if Convert.to_boolean( - SCR.Execute( - path(".snapper.create_config"), - { - "config_name" => "root", - "subvolume" => "/", - "fstype" => "btrfs" - } - ) - ) + if SCR.Execute(path(".target.bash"), "/usr/bin/snapper create-config --fstype=btrfs /") == 0 SCR.Write(path(".sysconfig.yast2.USE_SNAPPER"), "yes") end end end + else Builtins.y2error("unknown function: %1", @func) @ret = nil diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.0.2/src/modules/Storage.rb new/yast2-storage-3.0.3/src/modules/Storage.rb --- old/yast2-storage-3.0.2/src/modules/Storage.rb 2013-08-22 17:56:51.000000000 +0200 +++ new/yast2-storage-3.0.3/src/modules/Storage.rb 2013-09-13 12:41:54.000000000 +0200 @@ -2895,18 +2895,15 @@ Builtins.y2milestone("ChangeVolumeProperties sint ret:%1", ret) end end - if ret == 0 && !Builtins.isempty(Ops.get_list(part, "subvol", [])) - d = Ops.get_string(part, "device", "") - rem = Builtins.filter(Ops.get_list(part, "subvol", [])) do |p| - Ops.get_boolean(p, "delete", false) - end - cre = Builtins.filter(Ops.get_list(part, "subvol", [])) do |p| - Ops.get_boolean(p, "create", false) - end + if ret == 0 && !part.fetch("subvol",[]).empty? + 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 } Builtins.y2milestone("ChangeVolumeProperties rem:%1", rem) Builtins.y2milestone("ChangeVolumeProperties cre:%1", cre) - while ret == 0 && !Builtins.isempty(rem) - pth = Ops.get_string(rem, [0, "name"], "") + while ret == 0 && !rem.empty? + pth = rem.first.fetch("name","") if @sint.existSubvolume(d, pth) changed = true ret = @sint.removeSubvolume(d, pth) @@ -2916,10 +2913,10 @@ Builtins.y2milestone("ChangeVolumeProperties sint ret:%1", ret) end end - rem = Builtins.remove(rem, 0) + rem = rem.drop(1) end - while ret == 0 && !Builtins.isempty(cre) - pth = Ops.get_string(cre, [0, "name"], "") + while ret == 0 && !cre.empty? + pth = cre.first.fetch("name","") if ! @sint.existSubvolume(d, pth) changed = true ret = @sint.createSubvolume(d, pth) @@ -2929,7 +2926,7 @@ Builtins.y2milestone("ChangeVolumeProperties sint ret:%1", ret) end end - cre = Builtins.remove(cre, 0) + cre = cre.drop(1) end end UpdateTargetMapDev(dev) if changed @@ -4871,15 +4868,34 @@ def AddSubvolRoot(part) part = deep_copy(part) + def_subvol = [ - "tmp", + "home", "opt", "srv", + "tmp", + "usr/local", "var/crash", - "var/spool", "var/log", + "var/opt", + "var/spool", "var/tmp" ] + + if Arch.i386 + def_subvol.push("boot/grub2/i386-pc") + end + + if Arch.x86_64 + def_subvol.push("boot/grub2/x86_64-efi") + end + + if Arch.ppc + def_subvol.push("boot/grub2/power-ieee1275") + end + + def_subvol.sort!() + sv_prepend = "" Builtins.y2milestone( "AddSubvolRoot subvol:%1", -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
