Hello community,
here is the log from the commit of package autoyast2 for openSUSE:Factory checked in at 2014-06-26 08:00:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2014-06-02 07:00:06.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.autoyast2.new/autoyast2.changes 2014-06-26 08:00:52.000000000 +0200
@@ -1,0 +2,68 @@
+Wed Jun 25 09:49:05 CEST 2014 - schubi@suse.de
+
+- Setting default filesystem if it has not been set in autoinst.xml
+ (bnc#880569)
+- 3.1.39
+
+-------------------------------------------------------------------
+Tue Jun 24 11:02:38 CEST 2014 - schubi@suse.de
+
+- Restarting systemd-logind.service after finishing the configuration.
+ (bnc#878920)
+- 3.1.38
+
+-------------------------------------------------------------------
+Mon Jun 23 12:57:43 UTC 2014 - jreidinger@suse.com
+
+- allow cloning to custom file (bnc#881108)
+- 3.1.37
+
+-------------------------------------------------------------------
+Mon Jun 23 10:53:03 CEST 2014 - schubi@suse.de
+
+- Fixed logging (bnc#883561)
+- 3.1.36
+
+-------------------------------------------------------------------
+Fri Jun 20 16:01:21 CEST 2014 - schubi@suse.de
+
+- Do not set Mode.config after the autoyast installation has been
+ booted into the system. The original Bug #881378 has been
+ fixed on another place. The current fix solves the Bug
+ bnc#883025
+- 3.1.35
+
+-------------------------------------------------------------------
+Thu Jun 12 14:33:38 UTC 2014 - schubi@suse.com
+
+- Enable snapshots in autoyast. (bnc#878722)
+- 3.1.34
+
+-------------------------------------------------------------------
+Thu Jun 12 10:45:16 CEST 2014 - schubi@suse.de
+
+- Checking auto,max flag in storage correctly. (bnc#878950)
+- 3.1.33
+
+-------------------------------------------------------------------
+Fri Jun 6 12:55:07 UTC 2014 - schubi@suse.com
+
+- Setting the Mode.config after the autoyast installation has been
+ booted into the system. (bnc#881378)
+- 3.1.32
+
+-------------------------------------------------------------------
+Thu Jun 05 17:36:47 CEST 2014 - aschnell@suse.de
+
+- readded suse_update_desktop_file call in spec file (bnc#877671)
+- 3.1.31
+
+-------------------------------------------------------------------
+Tue Jun 3 13:09:47 CEST 2014 - schubi@suse.de
+
+- GRUB_BIOS partitions must not be formated with default filesystem
+ btrfs
+ (bnc#876411)
+- 3.1.30
+
+-------------------------------------------------------------------
Old:
----
autoyast2-3.1.29.tar.bz2
New:
----
autoyast2-3.1.39.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ autoyast2.spec ++++++
--- /var/tmp/diff_new_pack.6dB3Ra/_old 2014-06-26 08:00:53.000000000 +0200
+++ /var/tmp/diff_new_pack.6dB3Ra/_new 2014-06-26 08:00:53.000000000 +0200
@@ -17,7 +17,7 @@
Name: autoyast2
-Version: 3.1.29
+Version: 3.1.39
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -114,6 +114,12 @@
%install
%yast_install
+# Do not *blindly* remove the suse_update_desktop_file calls here. It is
+# different from the code in the yast_install macro.
+for d in $RPM_BUILD_ROOT/usr/share/autoinstall/modules/*.desktop ; do
+ %suse_update_desktop_file $d
+done
+
# Class conf
install -d -m 700 $RPM_BUILD_ROOT/etc/autoinstall
# Installation files
++++++ autoyast2-3.1.29.tar.bz2 -> autoyast2-3.1.39.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.29/package/autoyast2.changes new/autoyast2-3.1.39/package/autoyast2.changes
--- old/autoyast2-3.1.29/package/autoyast2.changes 2014-05-27 15:10:46.000000000 +0200
+++ new/autoyast2-3.1.39/package/autoyast2.changes 2014-06-25 12:25:26.000000000 +0200
@@ -1,4 +1,72 @@
-------------------------------------------------------------------
+Wed Jun 25 09:49:05 CEST 2014 - schubi@suse.de
+
+- Setting default filesystem if it has not been set in autoinst.xml
+ (bnc#880569)
+- 3.1.39
+
+-------------------------------------------------------------------
+Tue Jun 24 11:02:38 CEST 2014 - schubi@suse.de
+
+- Restarting systemd-logind.service after finishing the configuration.
+ (bnc#878920)
+- 3.1.38
+
+-------------------------------------------------------------------
+Mon Jun 23 12:57:43 UTC 2014 - jreidinger@suse.com
+
+- allow cloning to custom file (bnc#881108)
+- 3.1.37
+
+-------------------------------------------------------------------
+Mon Jun 23 10:53:03 CEST 2014 - schubi@suse.de
+
+- Fixed logging (bnc#883561)
+- 3.1.36
+
+-------------------------------------------------------------------
+Fri Jun 20 16:01:21 CEST 2014 - schubi@suse.de
+
+- Do not set Mode.config after the autoyast installation has been
+ booted into the system. The original Bug #881378 has been
+ fixed on another place. The current fix solves the Bug
+ bnc#883025
+- 3.1.35
+
+-------------------------------------------------------------------
+Thu Jun 12 14:33:38 UTC 2014 - schubi@suse.com
+
+- Enable snapshots in autoyast. (bnc#878722)
+- 3.1.34
+
+-------------------------------------------------------------------
+Thu Jun 12 10:45:16 CEST 2014 - schubi@suse.de
+
+- Checking auto,max flag in storage correctly. (bnc#878950)
+- 3.1.33
+
+-------------------------------------------------------------------
+Fri Jun 6 12:55:07 UTC 2014 - schubi@suse.com
+
+- Setting the Mode.config after the autoyast installation has been
+ booted into the system. (bnc#881378)
+- 3.1.32
+
+-------------------------------------------------------------------
+Thu Jun 05 17:36:47 CEST 2014 - aschnell@suse.de
+
+- readded suse_update_desktop_file call in spec file (bnc#877671)
+- 3.1.31
+
+-------------------------------------------------------------------
+Tue Jun 3 13:09:47 CEST 2014 - schubi@suse.de
+
+- GRUB_BIOS partitions must not be formated with default filesystem
+ btrfs
+ (bnc#876411)
+- 3.1.30
+
+-------------------------------------------------------------------
Wed May 26 18:54:23 CEST 2014 - dvaleev@suse.com
- Fix broken disklabel fetch (bnc#879147)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.29/package/autoyast2.spec new/autoyast2-3.1.39/package/autoyast2.spec
--- old/autoyast2-3.1.29/package/autoyast2.spec 2014-05-27 15:10:46.000000000 +0200
+++ new/autoyast2-3.1.39/package/autoyast2.spec 2014-06-25 12:25:26.000000000 +0200
@@ -17,7 +17,7 @@
Name: autoyast2
-Version: 3.1.29
+Version: 3.1.39
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -114,6 +114,12 @@
%install
%yast_install
+# Do not *blindly* remove the suse_update_desktop_file calls here. It is
+# different from the code in the yast_install macro.
+for d in $RPM_BUILD_ROOT/usr/share/autoinstall/modules/*.desktop ; do
+ %suse_update_desktop_file $d
+done
+
# Class conf
install -d -m 700 $RPM_BUILD_ROOT/etc/autoinstall
# Installation files
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.29/src/clients/clone_system.rb new/autoyast2-3.1.39/src/clients/clone_system.rb
--- old/autoyast2-3.1.29/src/clients/clone_system.rb 2014-05-27 15:10:46.000000000 +0200
+++ new/autoyast2-3.1.39/src/clients/clone_system.rb 2014-06-25 12:25:26.000000000 +0200
@@ -37,44 +37,42 @@
end
end
- @cmdline = {
- "id" => "clone_system",
- "help" => _(
- "Client for creating an AutoYaST profile based on the currently running system"
- ),
- "guihandler" => fun_ref(method(:GUI), "symbol ()"),
- "actions" => {
- "modules" => {
- "handler" => fun_ref(
- method(:doClone),
- "boolean (map )"
- ),
- "help" => Builtins.sformat(_("known modules: %1"), @moduleList),
- "example" => "modules clone=software,partitioning"
- }
- },
- "options" => {
- "clone" => {
- "type" => "string",
- "help" => _("comma separated list of modules to clone")
- }
- },
- "mappings" => { "modules" => ["clone"] }
- }
-
+ # if we get no argument or map of options we are not in command line
+ if [NilClass, Hash].any? { |c| WFM.Args.first.is_a?(c) }
+ params = WFM.Args.first || {}
+ doClone(params)
+ else
+ cmdline = {
+ "id" => "clone_system",
+ "help" => _(
+ "Client for creating an AutoYaST profile based on the currently running system"
+ ),
+ "guihandler" => fun_ref(method(:GUI), "symbol ()"),
+ "actions" => {
+ "modules" => {
+ "handler" => fun_ref(
+ method(:doClone),
+ "boolean (map )"
+ ),
+ "help" => Builtins.sformat(_("known modules: %1"), @moduleList),
+ "example" => "modules clone=software,partitioning"
+ }
+ },
+ "options" => {
+ "clone" => {
+ "type" => "string",
+ "help" => _("comma separated list of modules to clone")
+ }
+ },
+ "mappings" => { "modules" => ["clone"] }
+ }
- @ret = true
+ ret = CommandLine.Run(cmdline)
+ Builtins.y2debug("ret = %1", ret)
- if Builtins.size(WFM.Args) == 0
- doClone({})
- else
- @ret = CommandLine.Run(@cmdline)
end
- Builtins.y2debug("ret = %1", @ret)
Builtins.y2milestone("----------------------------------------")
- Builtins.y2milestone("clone_system finished")
-
- # doClone();
+ Builtins.y2milestone("clone_system finished")
nil
end
@@ -86,10 +84,11 @@
end
def doClone(options)
- options = deep_copy(options)
+ target_path = options["target_path"] || "/root/autoinst.xml"
Popup.ShowFeedback(
_("Cloning the system..."),
- _("The resulting autoyast profile can be found in /root/autoinst.xml.")
+ # TRANSLATORS: %s is path where profile can be found
+ _("The resulting autoyast profile can be found in %s.") % target_path
)
if Ops.get_string(options, "clone", "") != ""
@@ -101,7 +100,7 @@
AutoinstClone.additional = deep_copy(ProductControl.clone_modules)
end
AutoinstClone.Process
- XML.YCPToXMLFile(:profile, Profile.current, "/root/autoinst.xml")
+ XML.YCPToXMLFile(:profile, Profile.current, target_path)
Popup.ClearFeedback
true
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.29/src/clients/inst_autoconfigure.rb new/autoyast2-3.1.39/src/clients/inst_autoconfigure.rb
--- old/autoyast2-3.1.29/src/clients/inst_autoconfigure.rb 2014-05-27 15:10:46.000000000 +0200
+++ new/autoyast2-3.1.39/src/clients/inst_autoconfigure.rb 2014-06-25 12:25:26.000000000 +0200
@@ -264,7 +264,6 @@
"YaST2-Second-Stage.service",
"autoyast-initscripts.service"
]
- @ser_no_restart = ["systemd-logind.service"]
logStep(_("Restarting all running services"))
@cmd = "systemctl --type=service list-units | grep \" running \" | sed s/[[:space:]].*//"
@@ -274,7 +273,7 @@
) { |s| Ops.greater_than(Builtins.size(s), 0) }
Builtins.y2milestone("running services \"%1\"", @sl)
@sl = Builtins.filter(@sl) do |s|
- !Builtins.contains(Builtins.union(@ser_ignore, @ser_no_restart), s)
+ !Builtins.contains(@ser_ignore, s)
end
Builtins.y2milestone("restarting services \"%1\"", @sl)
@cmd = Ops.add(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.29/src/clients/inst_autosetup_upgrade.rb new/autoyast2-3.1.39/src/clients/inst_autosetup_upgrade.rb
--- old/autoyast2-3.1.29/src/clients/inst_autosetup_upgrade.rb 2014-05-27 15:10:46.000000000 +0200
+++ new/autoyast2-3.1.39/src/clients/inst_autosetup_upgrade.rb 2014-06-25 12:25:26.000000000 +0200
@@ -290,7 +290,8 @@
if !Update.OnlyUpdateInstalled
Packages.default_patterns.each do |pattern|
- log.info "Pre-select pattern #{pattern}: " << Pkg.ResolvableInstall(pattern, :pattern)
+ result = Pkg.ResolvableInstall(pattern, :pattern)
+ log.info "Pre-select pattern #{pattern}: #{result}"
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.29/src/include/autoinstall/autopart.rb new/autoyast2-3.1.39/src/include/autoinstall/autopart.rb
--- old/autoyast2-3.1.29/src/include/autoinstall/autopart.rb 2014-05-27 15:10:46.000000000 +0200
+++ new/autoyast2-3.1.39/src/include/autoinstall/autopart.rb 2014-06-25 12:25:26.000000000 +0200
@@ -197,21 +197,29 @@
)
)
end
+
if Ops.get_string(partition, "mount", "") == Partitions.BootMount
if Ops.get_integer(partition, "size", 0) == -1
Ops.set(partition, "size", Partitions.MinimalNeededBootsize)
end
- if Ops.get_symbol(partition, "filesystem", :none) == :none
- Ops.set(partition, "filesystem", Partitions.DefaultBootFs)
- end
-
if Ops.get_integer(partition, "filesystem_id", 0) == 0
Ops.set(partition, "filesystem_id", Partitions.FsidBoot(dlabel))
end
#partition["max_cyl"] = Partitions::BootCyl();
end
+
+ #Setting default filesystem if it has not been a part of autoinst.xml
+ #Bug 880569
+ if !partition.has_key?("filesystem") || partition["filesystem"] == :none
+ if partition["mount"] == Partitions.BootMount
+ partition["filesystem"] = Partitions.DefaultBootFs
+ else
+ partition["filesystem"] = Partitions.DefaultFs
+ end
+ end
+
if Ops.get_integer(partition, "size", 0) == -1
Ops.set(partition, "size", 0)
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.29/src/modules/AutoinstDrive.rb new/autoyast2-3.1.39/src/modules/AutoinstDrive.rb
--- old/autoyast2-3.1.29/src/modules/AutoinstDrive.rb 2014-05-27 15:10:46.000000000 +0200
+++ new/autoyast2-3.1.39/src/modules/AutoinstDrive.rb 2014-06-25 12:25:26.000000000 +0200
@@ -32,6 +32,7 @@
"type" => :CT_DISK, # type of drive, see diskTypes below
"use" => :all, # `all, `linux, `free, or list of partition numbers to use
"pesize" => "",
+ "enable_snapshots" => true,
"disklabel" => "msdos" # type of partition table (msdos or gpt)
} # size of physical extents (currently no GUI support for this setting)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.29/src/modules/AutoinstPartition.rb new/autoyast2-3.1.39/src/modules/AutoinstPartition.rb
--- old/autoyast2-3.1.29/src/modules/AutoinstPartition.rb 2014-05-27 15:10:46.000000000 +0200
+++ new/autoyast2-3.1.39/src/modules/AutoinstPartition.rb 2014-06-25 12:25:26.000000000 +0200
@@ -342,6 +342,18 @@
else
newPart = Builtins.remove(newPart, "raid_options")
end
+
+ if part["partition_id"] == Partitions.fsid_bios_grub
+ # GRUB_BIOS partitions must not be formated
+ # with default filesystem btrfs. (bnc#876411)
+ # The other deleted entries would be useless in that case.
+ newPart.delete("filesystem")
+ newPart.delete("format")
+ newPart.delete("crypt_fs")
+ newPart.delete("loop_fs")
+ newPart.delete("mountby")
+ end
+
deep_copy(newPart)
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.29/src/modules/AutoinstStorage.rb new/autoyast2-3.1.39/src/modules/AutoinstStorage.rb
--- old/autoyast2-3.1.29/src/modules/AutoinstStorage.rb 2014-05-27 15:10:46.000000000 +0200
+++ new/autoyast2-3.1.39/src/modules/AutoinstStorage.rb 2014-06-25 12:25:26.000000000 +0200
@@ -10,6 +10,9 @@
module Yast
class AutoinstStorageClass < Module
+
+ include Yast::Logger
+
def main
Yast.import "UI"
textdomain "autoinst"
@@ -705,6 +708,8 @@
d["partitions"] = d.fetch("partitions",[]).sort do |x, y|
x.fetch("partition_nr",99)<=>y.fetch("partition_nr",99)
end
+ # snapshots are default
+ d["enable_snapshots"] = true unless d.has_key?("enable_snapshots")
deep_copy(d)
end
@@ -853,8 +858,7 @@
Builtins.sformat("%1", Partitions.MinimalNeededBootsize)
)
end
- if Ops.get_string(pe, "size", "") != "max" &&
- Ops.get_string(pe, "size", "") != "auto"
+ if !["max","auto"].include?(pe["size"].downcase)
Ops.set(
pe,
"size",
@@ -1088,7 +1092,7 @@
end
end
if changed
- Storage.SetTargetMap(initial_target_map) if changed
+ Storage.SetTargetMap(initial_target_map)
Builtins.y2milestone( "Target map after initializing disk: %1", Storage.GetTargetMap)
end
@@ -1131,6 +1135,15 @@
Builtins.y2milestone("solutions: %1", sol)
Builtins.y2milestone("disk: %1", tm[device])
tm[device] = process_partition_data(device, sol)
+
+ if data["enable_snapshots"] && tm[device].has_key?("partitions")
+ root_partition = tm[device]["partitions"].find{|p| p["mount"] == "/" && p["used_fs"] == :btrfs}
+ if root_partition
+ log.debug("Enabling snapshots for \"/\"; device #{data['device']}")
+ root_partition["userdata"] = { "/" => "snapshots" }
+ end
+ end
+
changed = true
SearchRaids(tm)
Builtins.y2milestone("disk: %1", tm[device])
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org