[kexec-tools] Update initramfs code.
Cong Wang
wangcong at fedoraproject.org
Thu Jul 21 10:52:29 UTC 2011
commit f1a206963d8ab9a5433dcc163a4ce133436b9d94
Author: Amerigo Wang <amwang at redhat.com>
Date: Thu Jul 21 18:48:58 2011 +0800
Update initramfs code.
kdump_dracut_modules/99kdumpbase/check | 11 +-
kdump_dracut_modules/99kdumpbase/install | 7 +-
kdump_dracut_modules/99kdumpbase/kdump_localfs.sh | 14 ++
kdump_initscripts/init | 185 ---------------------
kdump_initscripts/kdumpinit.rootfs | 72 --------
kdump_sample_manifests/manifest.localrootfs | 9 -
kexec-tools.spec | 5 +
sources | 1 +
8 files changed, 30 insertions(+), 274 deletions(-)
---
diff --git a/kdump_dracut_modules/99kdumpbase/check b/kdump_dracut_modules/99kdumpbase/check
index a9de7dd..191fa75 100755
--- a/kdump_dracut_modules/99kdumpbase/check
+++ b/kdump_dracut_modules/99kdumpbase/check
@@ -1,10 +1,9 @@
-#!/bin/sh
-if [ ! -f /etc/kdump-adv-conf/init ]
+#!/bin/bash
+
+#kdumpctl sets this explicitly
+if [ -z "$IN_KDUMP" ]
then
- # exit if we didn't set up an init script
exit 1
fi
-
-#do not add this module by default
-exit 1
+exit 0
diff --git a/kdump_dracut_modules/99kdumpbase/install b/kdump_dracut_modules/99kdumpbase/install
index 8f38a67..bfc4761 100755
--- a/kdump_dracut_modules/99kdumpbase/install
+++ b/kdump_dracut_modules/99kdumpbase/install
@@ -1,5 +1,8 @@
#!/bin/bash
-rm -f $initdir/init
-inst "/etc/kdump-adv-conf/init" "/init"
+
inst "/bin/date" "/bin/date"
+inst "/bin/sync" "/bin/sync"
inst "/usr/bin/reboot" "/bin/reboot"
+inst "/sbin/makedumpfile" "/sbin/makedumpfile"
+inst_hook pre-pivot 01 "$moddir/kdump_localfs.sh"
+
diff --git a/kdump_dracut_modules/99kdumpbase/kdump_localfs.sh b/kdump_dracut_modules/99kdumpbase/kdump_localfs.sh
new file mode 100755
index 0000000..513142b
--- /dev/null
+++ b/kdump_dracut_modules/99kdumpbase/kdump_localfs.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -x
+# We have the root file system mounted under $NEWROOT, so copy
+# the vmcore there and call it a day
+#
+DATEDIR=`date +%d.%m.%y-%T`
+mount -o remount,rw $NEWROOT/
+mkdir -p $NEWROOT/var/crash/$DATEDIR
+cp /proc/vmcore $NEWROOT/var/crash/$DATEDIR/vmcore
+sync
+
+# Once the copy is done, just reboot the system
+reboot -f
diff --git a/kexec-tools.spec b/kexec-tools.spec
index 270d696..91c9688 100644
--- a/kexec-tools.spec
+++ b/kexec-tools.spec
@@ -169,6 +169,7 @@ mkdir -p -m755 $RPM_BUILD_ROOT/etc/kdump-adv-conf
tar -C $RPM_BUILD_ROOT/etc/kdump-adv-conf -jxvf %{SOURCE100}
chmod 755 $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/check
chmod 755 $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/install
+chmod 755 $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/kdump_localfs.sh
#and move the custom dracut modules to the dracut directory
@@ -282,6 +283,10 @@ done
%changelog
+* Thu Jul 21 2011 Cong Wang <xiyou.wangcong at gmail.com> - 2.0.2-4
+- Update initramfs infrastructure to make it working
+ with dracut.
+
* Wed Jul 06 2011 Neil Horman <nhorman at redhat.com> - 2.0.2-3
- Removed sysv init script from package
diff --git a/sources b/sources
index e2ae88e..b3a1212 100644
--- a/sources
+++ b/sources
@@ -3,3 +3,4 @@ d9f2ecd3c3307905f24130a25816e6cc kexec-tools-2.0.0.tar.bz2
3e802d638dce0080b910f15908c04a24 kexec-tools-po.tar.gz
e3a813bd6d7dace903a05c1296e20d57 makedumpfile-1.3.5.tar.gz
8e359dd03731b93a2082bd37cc2a4a4c kexec-tools-2.0.2.tar.bz2
+d872bdde29eb036cd59e7b71c148fca6 dracut-files.tbz2
More information about the scm-commits
mailing list