Hello community,
here is the log from the commit of package yast2-bootloader for openSUSE:Factory
checked in at Mon Mar 1 01:51:46 CET 2010.
--------
--- yast2-bootloader/yast2-bootloader.changes 2010-02-22 12:13:59.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-bootloader/yast2-bootloader.changes 2010-02-26 10:21:25.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Feb 26 10:20:10 CET 2010 - juhliarik@suse.cz
+
+- added fix for creating sysconfig directory file (bnc#583088)
+- 2.19.7
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-bootloader-2.19.1.tar.bz2
New:
----
yast2-bootloader-2.19.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.Q7vReJ/_old 2010-03-01 01:51:36.000000000 +0100
+++ /var/tmp/diff_new_pack.Q7vReJ/_new 2010-03-01 01:51:36.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-bootloader (Version 2.19.1)
+# spec file for package yast2-bootloader (Version 2.19.7)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,11 +19,11 @@
Name: yast2-bootloader
-Version: 2.19.1
-Release: 2
+Version: 2.19.7
+Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-bootloader-2.19.1.tar.bz2
+Source0: yast2-bootloader-2.19.7.tar.bz2
Prefix: /usr
@@ -67,7 +67,7 @@
This package contains the YaST2 component for bootloader configuration.
%prep
-%setup -n yast2-bootloader-2.19.1
+%setup -n yast2-bootloader-2.19.7
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-bootloader-2.19.1.tar.bz2 -> yast2-bootloader-2.19.7.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.19.1/VERSION new/yast2-bootloader-2.19.7/VERSION
--- old/yast2-bootloader-2.19.1/VERSION 2010-01-28 16:09:31.000000000 +0100
+++ new/yast2-bootloader-2.19.7/VERSION 2010-02-26 10:21:24.000000000 +0100
@@ -1 +1 @@
-2.19.1
+2.19.7
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.19.1/src/config/bootloader.desktop new/yast2-bootloader-2.19.7/src/config/bootloader.desktop
--- old/yast2-bootloader-2.19.1/src/config/bootloader.desktop 2009-02-17 13:41:52.000000000 +0100
+++ new/yast2-bootloader-2.19.7/src/config/bootloader.desktop 2010-02-04 10:14:02.000000000 +0100
@@ -19,9 +19,8 @@
X-SuSE-YaST-AutoInstSchema=bootloader.rnc
Icon=yast-bootloader
-Exec=/sbin/yast2 bootloader
+Exec=xdg-su -c "/sbin/yast2 bootloader"
Name=Boot Loader
GenericName=Configure the boot loader
-X-KDE-SubstituteUID=true
StartupNotify=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.19.1/src/grub/options.ycp new/yast2-bootloader-2.19.7/src/grub/options.ycp
--- old/yast2-bootloader-2.19.1/src/grub/options.ycp 2009-08-04 13:21:58.000000000 +0200
+++ new/yast2-bootloader-2.19.7/src/grub/options.ycp 2010-02-09 16:01:21.000000000 +0100
@@ -505,7 +505,7 @@
UI::ChangeWidget (`id ("boot_extended"), `Enabled, false);
}
- if ((!haskey(BootCommon::globals,"boot_custom")) &&
+ if ((!haskey(BootCommon::globals,"boot_custom")) ||
(BootCommon::globals["boot_custom"]:"" == ""))
{
UI::ChangeWidget (`id ("boot_custom_list"),`Enabled, false);
@@ -555,6 +555,9 @@
}
if ((boolean)UI::QueryWidget(`id("boot_custom"), `Value))
BootCommon::globals["boot_custom"]= (string)UI::QueryWidget(`id("boot_custom_list"), `Value);
+ //bnc#544809 Custom Boot Partition cannot be deleted
+ else
+ BootCommon::globals["boot_custom"]="";
}
/** FIXME: merge help text to one for BootLoaderLocationWidget
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.19.1/src/modules/BootCommon.ycp new/yast2-bootloader-2.19.7/src/modules/BootCommon.ycp
--- old/yast2-bootloader-2.19.1/src/modules/BootCommon.ycp 2009-10-13 15:49:10.000000000 +0200
+++ new/yast2-bootloader-2.19.7/src/modules/BootCommon.ycp 2010-02-11 13:37:33.000000000 +0100
@@ -15,7 +15,7 @@
* Joachim Plack
* Olaf Dabrunz
*
- * $Id: BootCommon.ycp 59004 2009-10-13 13:49:09Z juhliarik $
+ * $Id: BootCommon.ycp 60799 2010-02-11 12:36:14Z juhliarik $
*
*/
@@ -685,6 +685,9 @@
rdev = Storage::SLES9PersistentDevNames(rdev);
y2milestone( "sections: dev name after SLES9 persistent dev name translation: %1", rdev);
}
+ // bnc#533782 - after changing filesystem label system doesn't boot
+ if (s["append"]:"" != "")
+ s["append"] = remapResume(s["append"]:"",true);
s["root"] = BootStorage::Dev2MountByDev(rdev);
return s;
});
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.19.1/src/modules/BootStorage.ycp new/yast2-bootloader-2.19.7/src/modules/BootStorage.ycp
--- old/yast2-bootloader-2.19.1/src/modules/BootStorage.ycp 2010-01-06 16:50:28.000000000 +0100
+++ new/yast2-bootloader-2.19.7/src/modules/BootStorage.ycp 2010-02-11 13:51:00.000000000 +0100
@@ -323,10 +323,11 @@
* @param dev string device name
* @return string device name according to "mountby"
*/
-global define string Dev2MountByDev(string dev)
+global define string Dev2MountByDev(string dev)
{
- y2milestone ("Dev2MountByDev: %1", dev);
+ string tmp_dev = MountByDev2Dev(dev);
+ y2milestone ("Dev2MountByDev: %1 as kernel device name: %2", dev, tmp_dev);
// add all_partitions to partitions
if (MapAllPartitions())
y2milestone("Init all_partitions was done");
@@ -342,9 +343,9 @@
if (!Arch::ppc())
{
by_mount = Storage::GetDefaultMountBy();
- if (haskey(partitions, dev))
+ if (haskey(partitions, tmp_dev))
{
- symbol partition_mount_by = (symbol) partitions[dev, "mountby"]:nil;
+ symbol partition_mount_by = (symbol) partitions[tmp_dev, "mountby"]:nil;
if ((partition_mount_by != nil))
by_mount = partition_mount_by;
}
@@ -354,23 +355,23 @@
}
y2milestone("Mount-by: %1", by_mount);
- string ret = dev;
+ string ret = tmp_dev;
switch(by_mount)
{
// convert to udev_id
case (`id):
// partitions
- if ((partitions[dev, "udev_id"]:nil != nil) && (partitions[dev, "udev_id", 0]:nil != ""))
+ if ((partitions[tmp_dev, "udev_id"]:nil != nil) && (partitions[tmp_dev, "udev_id", 0]:nil != ""))
{
- ret = sformat ("/dev/disk/by-id/%1", partitions[dev, "udev_id", 0]:"");
- y2milestone ("Device name: %1 is converted to udev id: %2", dev, ret);
+ ret = sformat ("/dev/disk/by-id/%1", partitions[tmp_dev, "udev_id", 0]:"");
+ y2milestone ("Device name: %1 is converted to udev id: %2", tmp_dev, ret);
return ret;
}
// disks
- if ((devices[dev, "udev_id"]:nil != nil) && (devices[dev, "udev_id", 0]:nil != ""))
+ if ((devices[tmp_dev, "udev_id"]:nil != nil) && (devices[tmp_dev, "udev_id", 0]:nil != ""))
{
- ret = sformat ("/dev/disk/by-id/%1", devices[dev, "udev_id", 0]:"");
- y2milestone ("Device name: %1 is converted to udev id: %2", dev, ret);
+ ret = sformat ("/dev/disk/by-id/%1", devices[tmp_dev, "udev_id", 0]:"");
+ y2milestone ("Device name: %1 is converted to udev id: %2", tmp_dev, ret);
return ret;
}
break;
@@ -378,17 +379,17 @@
// convert to uuid
case (`uuid):
// partitions
- if ((partitions[dev, "uuid"]:nil != nil) && (partitions[dev, "uuid"]:nil != ""))
+ if ((partitions[tmp_dev, "uuid"]:nil != nil) && (partitions[tmp_dev, "uuid"]:nil != ""))
{
- ret = sformat ("/dev/disk/by-uuid/%1", partitions[dev, "uuid"]:"");
- y2milestone ("Device name: %1 is converted to uuid: %2", dev, ret);
+ ret = sformat ("/dev/disk/by-uuid/%1", partitions[tmp_dev, "uuid"]:"");
+ y2milestone ("Device name: %1 is converted to uuid: %2", tmp_dev, ret);
return ret;
}
// disks
- if ((devices[dev, "uuid"]:nil != nil) && (devices[dev, "uuid"]:nil != ""))
+ if ((devices[tmp_dev, "uuid"]:nil != nil) && (devices[tmp_dev, "uuid"]:nil != ""))
{
- ret = sformat ("/dev/disk/by-uuid/%1", devices[dev, "uuid"]:"");
- y2milestone ("Device name: %1 is converted to uuid: %2", dev, ret);
+ ret = sformat ("/dev/disk/by-uuid/%1", devices[tmp_dev, "uuid"]:"");
+ y2milestone ("Device name: %1 is converted to uuid: %2", tmp_dev, ret);
return ret;
}
break;
@@ -396,17 +397,17 @@
// convert to udev_path
case (`path):
// partitions
- if ((partitions[dev, "udev_path"]:nil != nil) && (partitions[dev, "udev_path"]:nil != ""))
+ if ((partitions[tmp_dev, "udev_path"]:nil != nil) && (partitions[tmp_dev, "udev_path"]:nil != ""))
{
- ret = sformat ("/dev/disk/by-path/%1", partitions[dev, "udev_path"]:"");
- y2milestone ("Device name: %1 is converted to udev path: %2", dev, ret);
+ ret = sformat ("/dev/disk/by-path/%1", partitions[tmp_dev, "udev_path"]:"");
+ y2milestone ("Device name: %1 is converted to udev path: %2", tmp_dev, ret);
return ret;
}
// disks
- if ((devices[dev, "udev_path"]:nil != nil) && (devices[dev, "udev_path"]:nil != ""))
+ if ((devices[tmp_dev, "udev_path"]:nil != nil) && (devices[tmp_dev, "udev_path"]:nil != ""))
{
- ret = sformat ("/dev/disk/by-path/%1", devices[dev, "udev_path"]:"");
- y2milestone ("Device name: %1 is converted to udev path: %2", dev, ret);
+ ret = sformat ("/dev/disk/by-path/%1", devices[tmp_dev, "udev_path"]:"");
+ y2milestone ("Device name: %1 is converted to udev path: %2", tmp_dev, ret);
return ret;
}
break;
@@ -414,20 +415,20 @@
// convert to label
case (`label):
// partitions
- if ((partitions[dev, "label"]:nil != nil) && (partitions[dev, "label"]:nil != ""))
+ if ((partitions[tmp_dev, "label"]:nil != nil) && (partitions[tmp_dev, "label"]:nil != ""))
{
- ret = sformat ("/dev/disk/by-label/%1", partitions[dev, "label"]:"");
- y2milestone ("Device name: %1 is converted to label: %2", dev, ret);
+ ret = sformat ("/dev/disk/by-label/%1", partitions[tmp_dev, "label"]:"");
+ y2milestone ("Device name: %1 is converted to label: %2", tmp_dev, ret);
return ret;
}
// disks
- y2milestone ("Disk doesn't support labels - name: %1 is converted to label: %2", dev, ret);
+ y2milestone ("Disk doesn't support labels - name: %1 is converted to label: %2", tmp_dev, ret);
return ret;
break;
// convert to device or uknown type
default:
- y2warning ("Convert %1 to `device or unknwn type, result: %2", dev, ret);
+ y2warning ("Convert %1 to `device or unknwn type, result: %2", tmp_dev, ret);
return ret;
break;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.19.1/src/modules/BootSupportCheck.ycp new/yast2-bootloader-2.19.7/src/modules/BootSupportCheck.ycp
--- old/yast2-bootloader-2.19.1/src/modules/BootSupportCheck.ycp 2009-06-26 11:18:15.000000000 +0200
+++ new/yast2-bootloader-2.19.7/src/modules/BootSupportCheck.ycp 2010-02-19 14:40:32.000000000 +0100
@@ -25,6 +25,7 @@
import "Storage";
import "BootCommon";
import "BootStorage";
+import "FileUtils";
/**
* List of problems found during last check
@@ -95,7 +96,8 @@
{
string cmd = "modprobe efivars 2>/dev/null";
map ret = (map)SCR::Execute (.target.bash_output, cmd);
- if (ret["exit"]:1 == 0)
+ // bnc#581213 - x86-64/UEFI: "Unsupported combination of hardware platform x86_64 and bootloader elilo"
+ if (FileUtils::Exists("/sys/firmware/efi/systab"))
return true;
else
return false;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.19.1/src/modules/Bootloader.ycp new/yast2-bootloader-2.19.7/src/modules/Bootloader.ycp
--- old/yast2-bootloader-2.19.1/src/modules/Bootloader.ycp 2009-12-04 16:16:45.000000000 +0100
+++ new/yast2-bootloader-2.19.7/src/modules/Bootloader.ycp 2010-02-11 16:18:09.000000000 +0100
@@ -12,7 +12,7 @@
* Jiri Srain
* Olaf Dabrunz
*
- * $Id: Bootloader.ycp 59966 2009-12-04 15:16:44Z juhliarik $
+ * $Id: Bootloader.ycp 60802 2010-02-11 15:16:50Z juhliarik $
*
*/
@@ -447,7 +447,7 @@
map params_to_save = $[];
string new_vga = getKernelParam (getDefaultSection (), "vgamode");
- if (new_vga != old_vga && new_vga != "false" && new_vga != "")
+ if (new_vga != old_vga && new_vga != "false" && new_vga != "" && new_vga !="ask")
{
Initrd::setSplash (new_vga);
if (Stage::initial ())
@@ -474,7 +474,7 @@
&& ! (BootCommon::write_settings["forbid_save_initrd"]:false))
{
string vga = getKernelParam (getDefaultSection (), "vgamode");
- if (vga != "false" && vga != "")
+ if (vga != "false" && vga != "" && vga !="ask")
{
Initrd::setSplash (vga);
if (Stage::initial ())
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.19.1/src/routines/misc.ycp new/yast2-bootloader-2.19.7/src/routines/misc.ycp
--- old/yast2-bootloader-2.19.1/src/routines/misc.ycp 2010-02-03 18:40:24.000000000 +0100
+++ new/yast2-bootloader-2.19.7/src/routines/misc.ycp 2010-02-26 10:23:04.000000000 +0100
@@ -12,7 +12,7 @@
* Jiri Srain
* Olaf Dabrunz
*
- * $Id: misc.ycp 59004 2009-10-13 13:49:09Z juhliarik $
+ * $Id: misc.ycp 61035 2010-02-26 09:20:36Z juhliarik $
*
* WARNING:
* To be included to BootCommon.ycp only, requires function
@@ -183,11 +183,13 @@
/**
* Function remap "resume" from section (append) to device name (/dev/sda)
* or to label (ufo_partition)
+ *
* @param map sections
+ * @param boolean true if convert resume to persistent device name
* @return map sections
*/
-define string remapResume(string append)
+define string remapResume(string append, boolean to_persistent)
{
if ((search(append, "resume")!=nil) && (search(append, "noresume") == nil))
{
@@ -206,7 +208,12 @@
y2debug("value of resume: %1",resume_arg[1]:"");
if (dev != "")
{
- string resume = "resume="+BootStorage::MountByDev2Dev(dev);
+ string resume ="";
+ // bnc#533782 - after changing filesystem label system doesn't boot
+ if (to_persistent)
+ resume = "resume="+BootStorage::Dev2MountByDev(dev);
+ else
+ resume = "resume="+BootStorage::MountByDev2Dev(dev);
y2debug("remap resume: %1",resume);
new_append = add(new_append, resume);
} else {
@@ -262,7 +269,7 @@
s["root"] = BootStorage::MountByDev2Dev(rdev);
if (s["append"]:"" != "")
- s["append"] = remapResume(s["append"]:"");
+ s["append"] = remapResume(s["append"]:"", false);
y2debug("remapping root: %1 from section to: %2 ",rdev ,s["root"]:"");
}
@@ -419,7 +426,8 @@
*/
global boolean InstallingToFloppy () {
boolean ret = false;
- if (loader_device == nil)
+ // Bug 539774 - bootloader module wants to write to floppy disk although there is none
+ if ((loader_device == nil) || (loader_device == ""))
return ret; // bug #333459 - boot loader editor: propose new configuration
// -- BLE tries to write something on the floppy disk
// bnc #180784 don't install to bootloader to floppy if ppc
@@ -957,7 +965,12 @@
return p["mount"]:"" == "swap" && ! p["delete"]:false;
});
foreach (map s, partitions, ``{
- string dev = (string)(s["device"]:"");
+ // bnc#577127 - Encrypted swap is not properly set up as resume device
+ string dev = "";
+ if ((s["crypt_device"]:"" != nil) && (s["crypt_device"]:"" != ""))
+ dev = (string)(s["crypt_device"]:"");
+ else
+ dev = (string)(s["device"]:"");
ret[dev] = (integer)(s["region", 1]:0) * cyl_size;
});
});
@@ -1386,7 +1399,7 @@
{
if (inst)
{
- if (!FileUtils::CheckAndCreatePath(Installation::destdir +"/etc/sysconfig"))
+ if (!FileUtils::Exists(Installation::destdir +"/etc/sysconfig"))
{
WFM::Execute(.local.mkdir, Installation::destdir + "/etc/sysconfig");
WFM::Execute(.local.bash, sformat ("touch %1/etc/sysconfig/bootloader", Installation::destdir));
@@ -1396,6 +1409,33 @@
}
return true;
}
+/** bnc #578545 - kdump misconfigures crashkernel parameter for Xen
+ * Check if default_append includes crashkernel arg
+ *
+ * @param string defaul_append
+ * @return string defaul_append without crashkernel
+ */
+
+define string deleteCrashkernelFromAppend (string append)
+{
+ y2milestone("Original append: %1",append);
+ list<string> list_append = splitstring(append, " ");
+
+ if (size(list_append)>0)
+ {
+ list_append = filter(string key, list_append,
+ {
+ if (search(key, "crashkernel") == nil)
+ return true;
+ else
+ return false;
+ });
+ }
+ string ret = mergestring(list_append, " ");
+ y2milestone("Filtered append: %1",ret);
+ return ret;
+}
+
/** FATE #302245 save kernel args etc to /etc/sysconfig/bootloader
* Function write/update info in /etc/sysconfig/bootloader
@@ -1488,7 +1528,7 @@
if (! xen_set)
{
- xen_kernel_append = default_append;
+ xen_kernel_append = deleteCrashkernelFromAppend(default_append);
xen_append = "";
xen_vga = default_vga;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org