Hello community,
here is the log from the commit of package yast2-bootloader
checked in at Mon Aug 20 23:42:47 CEST 2007.
--------
--- yast2-bootloader/yast2-bootloader.changes 2007-08-15 20:38:28.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-bootloader/yast2-bootloader.changes 2007-08-20 19:44:28.332322000 +0200
@@ -1,0 +2,5 @@
+Mon Aug 20 19:39:12 CEST 2007 - pth@suse.de
+
+- Implement one-time boot (Fate 301313)
+
+-------------------------------------------------------------------
Old:
----
yast2-bootloader-2.15.17.tar.bz2
New:
----
yast2-bootloader-2.15.18.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.j16490/_old 2007-08-20 23:42:19.000000000 +0200
+++ /var/tmp/diff_new_pack.j16490/_new 2007-08-20 23:42:19.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-bootloader (Version 2.15.17)
+# spec file for package yast2-bootloader (Version 2.15.18)
#
# Copyright (c) 2007 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.15.17
+Version: 2.15.18
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-bootloader-2.15.17.tar.bz2
+Source0: yast2-bootloader-2.15.18.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxslt limal-perl perl-Bootloader perl-XML-Writer perl-gettext sgml-skel swig update-alternatives update-desktop-files yast2-devtools yast2-installation yast2-perl-bindings yast2-storage yast2-testsuite
# to eliminate a cyclic dependency in autobuild:
@@ -50,7 +50,7 @@
Olaf Dabrunz
%prep
-%setup -n yast2-bootloader-2.15.17
+%setup -n yast2-bootloader-2.15.18
%build
%{prefix}/bin/y2tool y2autoconf
@@ -95,6 +95,8 @@
/usr/share/YaST2/schema/autoyast/rnc/bootloader.rnc
%changelog
+* Mon Aug 20 2007 - pth@suse.de
+- Implement one-time boot (Fate 301313)
* Wed Aug 15 2007 - od@suse.de
- forgot to use changed sections (feature #302302)
- added logging with y2milestone()s for last change
++++++ yast2-bootloader-2.15.17.tar.bz2 -> yast2-bootloader-2.15.18.tar.bz2 ++++++
++++ 2346 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-bootloader-2.15.17/configure.in new/yast2-bootloader-2.15.18/configure.in
--- old/yast2-bootloader-2.15.17/configure.in 2007-07-03 14:50:07.000000000 +0200
+++ new/yast2-bootloader-2.15.18/configure.in 2007-08-20 18:36:13.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-bootloader
dnl
-dnl -- This file is generated by y2autoconf 2.15.0 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.15.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-bootloader, 2.15.8, http://bugs.opensuse.org/, yast2-bootloader)
+AC_INIT(yast2-bootloader, 2.15.17, http://bugs.opensuse.org/, yast2-bootloader)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.15.8"
+VERSION="2.15.17"
RPMNAME="yast2-bootloader"
MAINTAINER="Olaf Dabrunz "
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-bootloader-2.15.17/Makefile.am new/yast2-bootloader-2.15.18/Makefile.am
--- old/yast2-bootloader-2.15.17/Makefile.am 2007-07-03 14:50:08.000000000 +0200
+++ new/yast2-bootloader-2.15.18/Makefile.am 2007-08-20 18:36:14.000000000 +0200
@@ -210,8 +210,7 @@
# For po/ modules
checkpo:
- test ! -d $(srcdir)/po || $(MAKE) -C po checkpo
-# test ! -d $(srcdir)/po \
-# || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; }
+ test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo
+# test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox
# Contents of ./SUBDIRS
SUBDIRS = src scripts agents doc
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-bootloader-2.15.17/src/clients/bootloader_finish.ycp new/yast2-bootloader-2.15.18/src/clients/bootloader_finish.ycp
--- old/yast2-bootloader-2.15.17/src/clients/bootloader_finish.ycp 2007-07-10 23:00:37.000000000 +0200
+++ new/yast2-bootloader-2.15.18/src/clients/bootloader_finish.ycp 2007-08-20 19:10:08.000000000 +0200
@@ -8,7 +8,7 @@
* Authors:
* Jiri Srain
*
- * $Id: bootloader_finish.ycp 39304 2007-07-10 21:00:36Z odabrunz $
+ * $Id: bootloader_finish.ycp 40371 2007-08-20 17:10:08Z pth $
*
*/
@@ -23,6 +23,7 @@
import "Misc";
import "Mode";
import "Update";
+import "BootCommon";
any ret = nil;
string func = "";
@@ -162,6 +163,10 @@
Update::installedVersion,
Update::updateVersion);
}
+
+ string default_name = BootCommon::globals["default"]:"";
+
+ return Bootloader::FlagOnetimeBoot (default_name);
}
else
{
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-bootloader-2.15.17/src/modules/BootELILO.ycp new/yast2-bootloader-2.15.18/src/modules/BootELILO.ycp
--- old/yast2-bootloader-2.15.17/src/modules/BootELILO.ycp 2007-07-13 18:18:09.000000000 +0200
+++ new/yast2-bootloader-2.15.18/src/modules/BootELILO.ycp 2007-08-20 19:10:08.000000000 +0200
@@ -15,7 +15,7 @@
* Jiri Srain
* Andreas Schwab
*
- * $Id: BootELILO.ycp 39407 2007-07-13 16:18:09Z odabrunz $
+ * $Id: BootELILO.ycp 40371 2007-08-20 17:10:08Z pth $
*
*/
@@ -573,6 +573,15 @@
];
}
+/**
+ * Set section to boot on next reboot.
+ * @param section string section to boot
+ * @return boolean true on success
+ */
+global define boolean FlagOnetimeBoot (string section) {
+ /* For now a dummy */
+ return true;
+}
/**
* Return map of provided functions
@@ -596,7 +605,6 @@
];
}
-
/**
* Initializer of ELILO bootloader
*/
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-bootloader-2.15.17/src/modules/BootGRUB.ycp new/yast2-bootloader-2.15.18/src/modules/BootGRUB.ycp
--- old/yast2-bootloader-2.15.17/src/modules/BootGRUB.ycp 2007-08-13 22:32:14.000000000 +0200
+++ new/yast2-bootloader-2.15.18/src/modules/BootGRUB.ycp 2007-08-20 18:18:02.000000000 +0200
@@ -13,7 +13,7 @@
* Jiri Srain
* Joachim Plack
*
- * $Id: BootGRUB.ycp 40242 2007-08-13 20:32:13Z odabrunz $
+ * $Id: BootGRUB.ycp 40367 2007-08-20 15:10:35Z pth $
*
*/
@@ -1001,6 +1001,33 @@
];
}
+/**
+ * Set section to boot on next reboot.
+ * @param section string section to boot
+ * @return boolean true on success
+ */
+global define boolean FlagOnetimeBoot (string section) {
+ integer index = -1;
+ integer sectnum = -1;
+
+ /**
+ * Determine section number to avoid having to quote
+ * the section name for grubonce.
+ */
+ foreach (map s, BootCommon::sections,
+ {
+ index = index + 1;
+ if (s["name"]:"" == section)
+ sectnum = index;
+ });
+
+ map result = (map)SCR::Execute (.target.bash_output, sformat (
+ "/usr/sbin/grubonce \"%1\"", sectnum));
+ y2milestone ("lilo returned %1", result);
+ return (result["exit"]:-1 == 0);
+}
+
+
/**
* Return map of provided functions
@@ -1021,6 +1048,7 @@
"wizard_sequencer" : WizardSequenzer,
"dialogs" : Dialogs,
"section_types" : section_types,
+ "flagonetimeboot" : FlagOnetimeBoot,
];
}
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-bootloader-2.15.17/src/modules/BootLILO.ycp new/yast2-bootloader-2.15.18/src/modules/BootLILO.ycp
--- old/yast2-bootloader-2.15.17/src/modules/BootLILO.ycp 2007-01-29 14:38:59.000000000 +0100
+++ new/yast2-bootloader-2.15.18/src/modules/BootLILO.ycp 2007-08-20 19:10:08.000000000 +0200
@@ -12,7 +12,7 @@
* Authors:
* Jiri Srain
*
- * $Id: BootLILO.ycp 34952 2006-12-14 12:57:33Z jplack $
+ * $Id: BootLILO.ycp 40371 2007-08-20 17:10:08Z pth $
*
*/
@@ -282,6 +282,18 @@
];
}
+/**
+ * Set section to boot on next reboot
+ * @param section string section to boot
+ * @return boolean true on success
+ */
+global define boolean FlagOnetimeBoot (string section)
+{
+ map result = (map)SCR::Execute (.target.bash_output,
+ sformat ("/sbin/lilo -R \"%1\"", section));
+ y2milestone ("lilo returned %1", result);
+ return (result["exit"]:-1 == 0);
+}
/**
* Return map of provided functions
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-bootloader-2.15.17/src/modules/BootPOWERLILO.ycp new/yast2-bootloader-2.15.18/src/modules/BootPOWERLILO.ycp
--- old/yast2-bootloader-2.15.17/src/modules/BootPOWERLILO.ycp 2007-08-10 19:14:44.000000000 +0200
+++ new/yast2-bootloader-2.15.18/src/modules/BootPOWERLILO.ycp 2007-08-20 19:10:08.000000000 +0200
@@ -15,7 +15,7 @@
* Joachim Plack
* Olaf Dabrunz
*
- * $Id: BootPOWERLILO.ycp 40208 2007-08-10 17:14:43Z odabrunz $
+ * $Id: BootPOWERLILO.ycp 40371 2007-08-20 17:10:08Z pth $
*
*/
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-bootloader-2.15.17/src/modules/BootZIPL.ycp new/yast2-bootloader-2.15.18/src/modules/BootZIPL.ycp
--- old/yast2-bootloader-2.15.17/src/modules/BootZIPL.ycp 2007-01-29 14:38:59.000000000 +0100
+++ new/yast2-bootloader-2.15.18/src/modules/BootZIPL.ycp 2007-08-20 19:10:08.000000000 +0200
@@ -13,7 +13,7 @@
* Joachim Plack
* Jiri Srain
*
- * $Id: BootZIPL.ycp 35416 2007-01-16 22:51:18Z jplack $
+ * $Id: BootZIPL.ycp 40371 2007-08-20 17:10:08Z pth $
*
*/
@@ -285,6 +285,15 @@
];
}
+/**
+ * Set section to boot on next reboot.
+ * @param section string section to boot
+ * @return boolean true on success
+ */
+global define boolean FlagOnetimeBoot (string section) {
+ /* For now a dummy */
+ return true;
+}
/**
* Return map of provided functions
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-bootloader-2.15.17/VERSION new/yast2-bootloader-2.15.18/VERSION
--- old/yast2-bootloader-2.15.17/VERSION 2007-08-15 20:34:06.000000000 +0200
+++ new/yast2-bootloader-2.15.18/VERSION 2007-08-20 19:10:30.000000000 +0200
@@ -1 +1 @@
-2.15.17
+2.15.18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org