Mailinglist Archive: opensuse-commit (1187 mails)

< Previous Next >
commit yast2-bootloader
  • From: root@xxxxxxx (h_root)
  • Date: Thu, 13 Apr 2006 17:13:52 +0200 (CEST)
  • Message-id: <20060413151352.B84878BE5C@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package yast2-bootloader
checked in at Thu Apr 13 17:13:52 CEST 2006.

--------
--- yast2-bootloader/yast2-bootloader.changes 2006-04-11 22:20:03.000000000 +0200
+++ STABLE/yast2-bootloader/yast2-bootloader.changes 2006-04-12 18:31:52.000000000 +0200
@@ -1,0 +2,25 @@
+Wed Apr 12 18:30:49 CEST 2006 - od@xxxxxxx
+
+- accept fsid 257 (Apple_Bootstrap) as pmac boot partition
+ (#165518)
+- 2.13.48
+
+-------------------------------------------------------------------
+Wed Apr 12 17:37:31 CEST 2006 - od@xxxxxxx
+
+- print-product.ycp:
+ - return short name for bootloaders other than grub (#163702)
+ - do not attach version to product name (#165466)
+- use short product name instead of "linux" as section name for
+ bootloaders other than grub (#163702)
+- 2.13.47
+
+-------------------------------------------------------------------
+Wed Apr 12 14:01:17 CEST 2006 - od@xxxxxxx
+
+- long name uses LABEL from content file everywhere now, so do not
+ attach version anymore (#163702)
+- fixed typo in message
+- 2.13.46
+
+-------------------------------------------------------------------

Old:
----
yast2-bootloader-2.13.45.tar.bz2

New:
----
yast2-bootloader-2.13.48.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.HSmJHi/_old 2006-04-13 17:11:52.000000000 +0200
+++ /var/tmp/diff_new_pack.HSmJHi/_new 2006-04-13 17:11:52.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-bootloader (Version 2.13.45)
+# spec file for package yast2-bootloader (Version 2.13.48)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild

Name: yast2-bootloader
-Version: 2.13.45
+Version: 2.13.48
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-bootloader-2.13.45.tar.bz2
+Source0: yast2-bootloader-2.13.48.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxslt limal-bootloader limal-devel perl-XML-Writer perl-gettext sgml-skel swig update-alternatives update-desktop-files yast2-devel yast2-devtools yast2-installation yast2-perl-bindings yast2-testsuite
PreReq: /bin/sed %fillup_prereq
@@ -60,7 +60,7 @@
Dan Meszaros

%prep
-%setup -n yast2-bootloader-2.13.45
+%setup -n yast2-bootloader-2.13.48

%build
%{prefix}/bin/y2tool y2autoconf
@@ -111,6 +111,22 @@
/usr/share/YaST2/clients/bootfloppy.ycp

%changelog -n yast2-bootloader
+* Wed Apr 12 2006 - od@xxxxxxx
+- accept fsid 257 (Apple_Bootstrap) as pmac boot partition
+ (#165518)
+- 2.13.48
+* Wed Apr 12 2006 - od@xxxxxxx
+- print-product.ycp:
+- return short name for bootloaders other than grub (#163702)
+- do not attach version to product name (#165466)
+- use short product name instead of "linux" as section name for
+ bootloaders other than grub (#163702)
+- 2.13.47
+* Wed Apr 12 2006 - od@xxxxxxx
+- long name uses LABEL from content file everywhere now, so do not
+ attach version anymore (#163702)
+- fixed typo in message
+- 2.13.46
* Tue Apr 11 2006 - od@xxxxxxx
- on pmac: propose only partitions smaller than 20 cylinders
(#158543)

++++++ yast2-bootloader-2.13.45.tar.bz2 -> yast2-bootloader-2.13.48.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.45/VERSION new/yast2-bootloader-2.13.48/VERSION
--- old/yast2-bootloader-2.13.45/VERSION 2006-04-11 22:17:41.000000000 +0200
+++ new/yast2-bootloader-2.13.48/VERSION 2006-04-12 18:30:26.000000000 +0200
@@ -1 +1 @@
-2.13.45
+2.13.48
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.45/src/clients/print-product.ycp new/yast2-bootloader-2.13.48/src/clients/print-product.ycp
--- old/yast2-bootloader-2.13.45/src/clients/print-product.ycp 2006-03-20 18:05:09.000000000 +0100
+++ new/yast2-bootloader-2.13.48/src/clients/print-product.ycp 2006-04-12 17:36:55.000000000 +0200
@@ -1,14 +1,38 @@
+/**
+ * File:
+ * clients/print-product.ycp
+ *
+ * Module:
+ * Print product name
+ *
+ * Summary:
+ * Prints the product name -- used by update-bootloader
+ *
+ * Authors:
+ * Stefan Fent <sf@xxxxxxx>
+ * Olaf Dabrunz <od@xxxxxxx>
+ *
+ * $Id: print-product.ycp 30071 2006-04-12 15:36:51Z odabrunz $
+ *
+ */
+
{
import "Product";
import "CommandLine";
import "Mode";

+ string name = "";
+
// activate command line mode
Mode::SetUI("commandline");
- string name = Product::name;
- string ver = Product::version;
- string namever = sformat("%1 %2", name, ver);
- //string namever = name + version;
- CommandLine::Print(namever);
+ // get loader type
+ string loader = (string)SCR::Read(.sysconfig.bootloader.LOADER_TYPE);
+ if (loader == "grub")
+ {
+ name = Product::name;
+ } else {
+ name = Product::short_name;
+ }
+ CommandLine::Print(name);
}

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.45/src/modules/BootELILO.ycp new/yast2-bootloader-2.13.48/src/modules/BootELILO.ycp
--- old/yast2-bootloader-2.13.45/src/modules/BootELILO.ycp 2006-04-11 16:34:58.000000000 +0200
+++ new/yast2-bootloader-2.13.48/src/modules/BootELILO.ycp 2006-04-12 14:01:05.000000000 +0200
@@ -13,7 +13,7 @@
* Jiri Srain <jsrain@xxxxxxx>
* Andreas Schwab <schwab@xxxxxxx>
*
- * $Id: BootELILO.ycp 29962 2006-04-10 23:12:09Z jplack $
+ * $Id: BootELILO.ycp 30058 2006-04-12 12:01:03Z odabrunz $
*
*/

@@ -149,8 +149,7 @@
if (! BootCommon::was_proposed)
{
create_efi_entry = true;
- efi_entry_name
- = sformat ("%1 %2", Product::name, Product::version);
+ efi_entry_name = Product::name;
}
if (! Stage::initial ())
create_efi_entry = true;
@@ -181,8 +180,7 @@

if (efi_entry_name == "" || efi_entry_name == nil)
{
- efi_entry_name
- = sformat ("%1 %2", Product::name, Product::version);
+ efi_entry_name = Product::name;
}
y2milestone ("EFI entry name: %1", efi_entry_name);
y2milestone ("Proposed sections: %1", BootCommon::sections);
@@ -223,8 +221,7 @@
"/usr/sbin/efibootmgr |grep \"%1\"", efi_path));
if (efi_status["exit"]:0 != 0)
{
- efi_entry_name
- = sformat ("%1 %2", Product::name, Product::version);
+ efi_entry_name = Product::name;
}
else
{
@@ -239,8 +236,7 @@
}
else
{
- efi_entry_name
- = sformat ("%1 %2", Product::name, Product::version);
+ efi_entry_name = Product::name;
}
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.45/src/modules/BootPOWERLILO.ycp new/yast2-bootloader-2.13.48/src/modules/BootPOWERLILO.ycp
--- old/yast2-bootloader-2.13.45/src/modules/BootPOWERLILO.ycp 2006-04-11 22:17:38.000000000 +0200
+++ new/yast2-bootloader-2.13.48/src/modules/BootPOWERLILO.ycp 2006-04-12 18:29:22.000000000 +0200
@@ -14,7 +14,7 @@
* Joachim Plack <jplack@xxxxxxx>
* Olaf Dabrunz <od@xxxxxxx>
*
- * $Id: BootPOWERLILO.ycp 30009 2006-04-11 20:17:34Z odabrunz $
+ * $Id: BootPOWERLILO.ycp 30079 2006-04-12 16:29:19Z odabrunz $
*
*/

@@ -290,8 +290,9 @@
(! p["delete"]:false)
&& is (p["fsid"]:nil, integer)
// both partition types Apple_Bootstrap and Apple_HFS can be
- // handled by PPC lilo; Storage maps both to fsid 258
- && (p["fsid"]:nil == 258)
+ // handled by PPC lilo; Storage was supposed to map both to fsid
+ // 258, but did not so far... using 257 as well
+ && (p["fsid"]:nil == 257 || p["fsid"]:nil == 258)
// the partition should be smaller than 20 cylinders (PPC lilo
// takes that size as well); estimating the kiBytes:
// 255 heads * 63 sectors * 20 cylinders * 512 bytes / 1024 bytes =
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.45/src/modules/GfxMenu.ycp new/yast2-bootloader-2.13.48/src/modules/GfxMenu.ycp
--- old/yast2-bootloader-2.13.45/src/modules/GfxMenu.ycp 2006-02-16 19:59:25.000000000 +0100
+++ new/yast2-bootloader-2.13.48/src/modules/GfxMenu.ycp 2006-04-12 17:36:55.000000000 +0200
@@ -12,7 +12,7 @@
* Jiri Srain <jsrain@xxxxxxx>
* Olaf Dabrunz <od@xxxxxxx>
*
- * $Id: GfxMenu.ycp 28080 2006-02-16 18:30:36Z odabrunz $
+ * $Id: GfxMenu.ycp 30071 2006-04-12 15:36:51Z odabrunz $
*
*/

@@ -121,6 +121,16 @@
// FIXME: find a better name: "! allow_blanks" really means that the bootloader is lilo
if (! allow_blanks)
{
+ if (orig == "linux")
+ {
+ import "Product";
+ string product = Product::short_name;
+ string prod_filtered = filterchars (product, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890 _.");
+ if (product == prod_filtered && product != " ")
+ {
+ filtered = prod_filtered;
+ }
+ }
y2milestone ("adapting section title for lilo: %1", filtered);
// label tag for lilo.conf has a restricted valid character set and
// limited allowed string length
@@ -158,7 +168,7 @@
&& ! Mode::test ())
{
import "Product";
- string product = sformat ("%1 %2", Product::name, Product::version);
+ string product = Product::name;
string prod_filtered = filterchars (product, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890 _.");
if (product == prod_filtered && product != " ")
{
@@ -242,8 +252,7 @@
if (contains (["linux", "failsafe", "previous", "xen"], k) && ! Mode::test ())
{
import "Product";
- string product
- = sformat ("%1 %2", Product::name, Product::version);
+ string product = Product::name;
if (product != " ")
{
if (k == "linux")
@@ -342,7 +351,7 @@
"/usr/lib/YaST2/bin/update_gfxmenu %1 %2 %3 %4",
tmpdir, data_dir, trans_file, lang_params);

- y2milestone ("Runnign command %1", command);
+ y2milestone ("Running command %1", command);
map ret = (map)SCR::Execute (.target.bash_output, command);
y2milestone ("GFXMenu update result: %1", ret);
return ret["exit"]:0 == 0;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.45/src/routines/autoinstall.ycp new/yast2-bootloader-2.13.48/src/routines/autoinstall.ycp
--- old/yast2-bootloader-2.13.45/src/routines/autoinstall.ycp 2005-12-01 16:34:18.000000000 +0100
+++ new/yast2-bootloader-2.13.48/src/routines/autoinstall.ycp 2006-04-12 14:01:06.000000000 +0200
@@ -11,7 +11,7 @@
* Authors:
* Jiri Srain <jsrain@xxxxxxx>
*
- * $Id: autoinstall.ycp 25718 2005-09-29 15:00:58Z jsrain $
+ * $Id: autoinstall.ycp 30058 2006-04-12 12:01:03Z odabrunz $
*
*/
{
@@ -93,8 +93,7 @@
import "Product";
if (Mode::autoinst ())
{
- def_label
- = sformat ("%1 %2", Product::name, Product::version);
+ def_label = Product::name;
}
}
// if EFI label not specified, use default label


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...


< Previous Next >