commit yast2-bootloader for openSUSE:Factory
Hello community,
here is the log from the commit of package yast2-bootloader for openSUSE:Factory
checked in at Fri Aug 7 16:33:02 CEST 2009.
--------
--- yast2-bootloader/yast2-bootloader.changes 2009-08-04 18:46:13.000000000 +0200
+++ yast2-bootloader/yast2-bootloader.changes 2009-08-06 13:51:51.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Aug 6 10:31:03 CEST 2009 - juhliarik@suse.cz
+
+- added support for enable SELinux (fate#305557)
+- 2.18.14
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-bootloader-2.18.13.tar.bz2
New:
----
yast2-bootloader-2.18.14.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.TkkBbJ/_old 2009-08-07 16:31:57.000000000 +0200
+++ /var/tmp/diff_new_pack.TkkBbJ/_new 2009-08-07 16:31:57.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-bootloader (Version 2.18.13)
+# spec file for package yast2-bootloader (Version 2.18.14)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,10 +19,10 @@
Name: yast2-bootloader
-Version: 2.18.13
+Version: 2.18.14
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-bootloader-2.18.13.tar.bz2
+Source0: yast2-bootloader-2.18.14.tar.bz2
Prefix: /usr
Group: System/YaST
License: GPL v2 or later
@@ -61,7 +61,7 @@
This package contains the YaST2 component for bootloader configuration.
%prep
-%setup -n yast2-bootloader-2.18.13
+%setup -n yast2-bootloader-2.18.14
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-bootloader-2.18.13.tar.bz2 -> yast2-bootloader-2.18.14.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.18.13/VERSION new/yast2-bootloader-2.18.14/VERSION
--- old/yast2-bootloader-2.18.13/VERSION 2009-08-04 17:59:52.000000000 +0200
+++ new/yast2-bootloader-2.18.14/VERSION 2009-08-06 10:31:52.000000000 +0200
@@ -1 +1 @@
-2.18.13
+2.18.14
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.18.13/src/clients/bootloader.ycp new/yast2-bootloader-2.18.14/src/clients/bootloader.ycp
--- old/yast2-bootloader-2.18.13/src/clients/bootloader.ycp 2009-04-16 15:05:29.000000000 +0200
+++ new/yast2-bootloader-2.18.14/src/clients/bootloader.ycp 2009-08-06 08:41:27.000000000 +0200
@@ -16,6 +16,7 @@
*/
{
textdomain "bootloader";
+
import "BootCommon";
import "Bootloader";
import "CommandLine";
@@ -268,6 +269,7 @@
any ret = CommandLine::Run (cmdline);
// boolean ret = GuiHandler ();
+
y2milestone ("Finishing bootloader configuration module");
return ret;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.18.13/src/modules/BootCommon.ycp new/yast2-bootloader-2.18.14/src/modules/BootCommon.ycp
--- old/yast2-bootloader-2.18.13/src/modules/BootCommon.ycp 2009-08-04 18:01:52.000000000 +0200
+++ new/yast2-bootloader-2.18.14/src/modules/BootCommon.ycp 2009-08-06 09:49:17.000000000 +0200
@@ -302,6 +302,11 @@
*/
global boolean enable_md_array_redundancy = nil;
+/** FATE#305557: Enable SELinux for 11.2
+ * if true create /selinux directory
+ */
+global boolean enable_selinux = false;
+
global define string getLoaderType (boolean recheck);
global define list<string> getBootloaders ();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.18.13/src/modules/Bootloader.ycp new/yast2-bootloader-2.18.14/src/modules/Bootloader.ycp
--- old/yast2-bootloader-2.18.13/src/modules/Bootloader.ycp 2009-07-24 17:05:52.000000000 +0200
+++ new/yast2-bootloader-2.18.14/src/modules/Bootloader.ycp 2009-08-06 10:25:48.000000000 +0200
@@ -62,7 +62,7 @@
global define boolean UpdateGfxMenu ();
global define void DelDuplicatedSections();
global define void ResolveSymlinksInSections();
-
+ void createSELinuxDir ();
/**
* Write is repeating again
* Because of progress bar during inst_finish
@@ -572,9 +572,10 @@
// call bootloader executable
y2milestone ("Calling bootloader executable");
ret = ret && blWrite ();
-
- if (! ret)
- {
+ // FATE#305557: Enable SELinux for 11.2
+ createSELinuxDir ();
+ if (! ret)
+ {
y2error ("Installing bootloader failed");
if (writeErrorPopup ())
{
@@ -586,19 +587,17 @@
return Write ();
}
}
- }
- else
- {
- if (BootCommon::InstallingToFloppy ())
- {
- BootCommon::updateTimeoutPopupForFloppy
- (BootCommon::getLoaderName (getLoaderType (), `summary));
}
+ else
+ {
+ if (BootCommon::InstallingToFloppy ())
+ {
+ BootCommon::updateTimeoutPopupForFloppy
+ (BootCommon::getLoaderName (getLoaderType (), `summary));
+ }
+ }
-
- }
-
- return ret;
+ return ret;
}
@@ -707,7 +706,8 @@
// call bootloader executable
y2milestone ("Calling bootloader executable");
ret = ret && blWrite ();
-
+ // FATE#305557: Enable SELinux for 11.2
+ createSELinuxDir ();
if (! ret)
{
y2error ("Installing bootloader failed");
@@ -1545,4 +1545,32 @@
return true;
}
+
+/** Fate #305557: Enable SELinux for 11.2
+ * Function cerate /selinux directory
+ * if SELinux is enabled
+ */
+
+void createSELinuxDir ()
+{
+ string path_file = "/selinux";
+ string cmd = "ls -d /selinux 2>/dev/null";
+ if (BootCommon::enable_selinux)
+ {
+ if (Mode::normal() || Mode::installation())
+ {
+ map out = (map)SCR::Execute(.target.bash_output, cmd);
+ y2milestone("runnning command: \"%1\" and return: %2", cmd, out);
+ if (out["stdout"]:"" != "/selinux\n")
+ SCR::Execute(.target.mkdir, path_file);
+ else
+ y2milestone("Directory /selinux already exist");
+ } else {
+ y2milestone("Skip creating /selinux directory -> wrong mode");
+ }
+ } else {
+ y2milestone("Skip creating /selinux directory");
+ }
+}
+
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.18.13/src/routines/dialogs.ycp new/yast2-bootloader-2.18.14/src/routines/dialogs.ycp
--- old/yast2-bootloader-2.18.13/src/routines/dialogs.ycp 2009-04-02 10:46:47.000000000 +0200
+++ new/yast2-bootloader-2.18.14/src/routines/dialogs.ycp 2009-08-06 09:36:49.000000000 +0200
@@ -164,7 +164,12 @@
// frame
`Frame (_("Section Settings"), `HBox (`HSpacing (2), `VBox (
`VSpacing (1),
- `Left("noverifyroot"),
+ `HBox
+ (
+ `Left("noverifyroot"),
+ `HSpacing(2),
+ `Left("enable_selinux")
+ ),
"image",
"initrd",
`HBox (
@@ -178,7 +183,7 @@
), `HSpacing (2));
list<string> widget_names = ["name", "image", "initrd", "root", "vgamode", "append"
- ,"noverifyroot"];
+ ,"noverifyroot", "enable_selinux"];
map
participants (1)
-
root@Hilbert.suse.de