aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2010-08-03 17:06:42 -0400
committerBill Nottingham <notting@redhat.com>2010-08-03 17:06:42 -0400
commitb92eda2753c564d96a5c52b5fbfc5eca1ab3f8b3 (patch)
treeeab333eb58ff42874f2b78aa211e9b9b7e35cff1
parentb1293c97a4d6d469b370227cb6a1da2bc16c8ae1 (diff)
downloadinitscripts-b92eda2753c564d96a5c52b5fbfc5eca1ab3f8b3.tar
initscripts-b92eda2753c564d96a5c52b5fbfc5eca1ab3f8b3.tar.gz
initscripts-b92eda2753c564d96a5c52b5fbfc5eca1ab3f8b3.tar.bz2
initscripts-b92eda2753c564d96a5c52b5fbfc5eca1ab3f8b3.tar.xz
initscripts-b92eda2753c564d96a5c52b5fbfc5eca1ab3f8b3.zip
When kexec-tools isn't installed, or isn't running, free kexec memory. (#613578)initscripts-9.03.14-1
Ideally, this would be inverted and memory wouldn't be allocated unless kexec-tools is installed and active.
-rw-r--r--init/kexec-disable.conf11
-rw-r--r--initscripts.spec5
2 files changed, 15 insertions, 1 deletions
diff --git a/init/kexec-disable.conf b/init/kexec-disable.conf
new file mode 100644
index 00000000..61470431
--- /dev/null
+++ b/init/kexec-disable.conf
@@ -0,0 +1,11 @@
+# On machines where kexec isn't going to be used, free the memory reserved for it.
+
+start on stopped rcS
+task
+
+script
+ if [ ! -x /sbin/kexec ] || ! chkconfig kdump 2>/dev/null ; then
+ echo -n "0" > /sys/kernel/kexec_crash_size 2>/dev/null
+ fi
+ exit 0
+end script
diff --git a/initscripts.spec b/initscripts.spec
index f24642f2..b713d456 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -2,7 +2,7 @@
Summary: The inittab file and the /etc/init.d scripts
Name: initscripts
-Version: 9.03.13
+Version: 9.03.14
# ppp-watch is GPLv2+, everything else is GPLv2
License: GPLv2 and GPLv2+
Group: System Environment/Base
@@ -239,6 +239,9 @@ rm -rf $RPM_BUILD_ROOT
/etc/profile.d/debug*
%changelog
+* Tue Aug 3 2010 Bill Nottingham <notting@redhat.com> - 9.03.14-1
+- free kexec-reserved memory when necessary (#613578)
+
* Mon Jul 26 2010 Bill Nottingham <notting@redhat.com> - 9.03.13-1
- rename_device - handle quoted 'DEVICE' (#614943, <harald@redhat.com>)
- rename_device - fix handling of s390 subchannels (#614739, <harald@redhat.com>)