rpms/plymouth/F-12 dont-unlink-devnull.patch, NONE, 1.1 plymouth.spec, 1.161, 1.162

Ray Strode rstrode at fedoraproject.org
Thu Oct 29 14:11:05 UTC 2009


Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11739

Modified Files:
	plymouth.spec 
Added Files:
	dont-unlink-devnull.patch 
Log Message:
- Don't unlink /dev/null (bug 531740)


dont-unlink-devnull.patch:
 main.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE dont-unlink-devnull.patch ---
>From 0980923c858b2e47bced54914f827df17fde8810 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Thu, 29 Oct 2009 10:04:34 -0400
Subject: [PATCH] [main] Don't unlink /dev/null

In shutdown mode we were unlinking a file that was set to /dev/null.
Removing /dev/null is a bad idea.
---
 src/main.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main.c b/src/main.c
index 77f839b..abfd430 100644
--- a/src/main.c
+++ b/src/main.c
@@ -397,7 +397,7 @@ get_log_spool_file_for_mode (ply_mode_t mode)
       filename = PLYMOUTH_SPOOL_DIRECTORY "/boot.log";
       break;
     case PLY_MODE_SHUTDOWN:
-      filename = _PATH_DEVNULL;
+      filename = NULL;
       break;
     default:
       fprintf (stderr, "Unhandled case in %s line %d\n", __FILE__, __LINE__);
-- 
1.6.5.1



Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/F-12/plymouth.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -p -r1.161 -r1.162
--- plymouth.spec	19 Oct 2009 18:42:23 -0000	1.161
+++ plymouth.spec	29 Oct 2009 14:10:59 -0000	1.162
@@ -6,7 +6,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.8.0
-Release: 0.2009.29.09.13%{?dist}
+Release: 0.2009.29.09.14%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -39,6 +39,7 @@ Patch5: fix-emergency-shell.patch
 Patch6: fix-details-clear-screen.patch
 Patch7: fix-text-shutdown-crash.patch
 Patch8: fix-text-ask-for-password.patch
+Patch9: dont-unlink-devnull.patch
 
 %description
 Plymouth provides an attractive graphical boot animation in
@@ -254,6 +255,7 @@ plugin.
 %patch6 -p1 -b .fix-details-clear-screen
 %patch7 -p1 -b .fix-text-shutdown-crash
 %patch8 -p1 -b .fix-text-ask-for-password
+%patch9 -p1 -b .dont-unlink-devnull
 
 %build
 %configure --enable-tracing --disable-tests --without-boot-entry \
@@ -471,6 +473,9 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Thu Oct 29 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.14
+- Don't unlink /dev/null (bug 531740)
+
 * Mon Oct 19 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.13
 - Drop nash dep (bug 528706)
 




More information about the fedora-extras-commits mailing list