aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2005-06-21 20:15:25 +0000
committerBill Nottingham <notting@redhat.com>2005-06-21 20:15:25 +0000
commit22f80b6b12a4ba45af8f7f7bfd4554636f13d6f9 (patch)
treeaa36387f4fffc341ad63eca06ac72328843ef759
parent451b490105e43984a8e55301e3be886cffb0279b (diff)
downloadinitscripts-22f80b6b12a4ba45af8f7f7bfd4554636f13d6f9.tar
initscripts-22f80b6b12a4ba45af8f7f7bfd4554636f13d6f9.tar.gz
initscripts-22f80b6b12a4ba45af8f7f7bfd4554636f13d6f9.tar.bz2
initscripts-22f80b6b12a4ba45af8f7f7bfd4554636f13d6f9.tar.xz
initscripts-22f80b6b12a4ba45af8f7f7bfd4554636f13d6f9.zip
add diskdump restore support (<tuchida@redhat.com>)
conflict with appropriate diskdumputils
-rw-r--r--initscripts.spec2
-rwxr-xr-xrc.d/rc.sysinit4
2 files changed, 5 insertions, 1 deletions
diff --git a/initscripts.spec b/initscripts.spec
index aa88acf8..c5e450a2 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -20,7 +20,7 @@ Requires: ethtool >= 1.8-2, kernel >= 2.6.11, /sbin/nash, /sbin/runuser
Conflicts: mkinitrd < 4.0
Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, kbd < 1.06-19, lokkit < 0.50-14
Conflicts: udev < 0:048
-Conflicts: tcsh < 6.13-5
+Conflicts: tcsh < 6.13-5, diskdumputils < 1.1.0
Obsoletes: rhsound sapinit
Prereq: /sbin/chkconfig, /usr/sbin/groupadd, /bin/sed, mktemp, fileutils, sh-utils
BuildPrereq: glib2-devel popt gettext pkgconfig
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 543e7c4d..b4bfdaa7 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -598,6 +598,10 @@ mkdir -m 1777 -p /tmp/.ICE-unix >/dev/null 2>&1
chown root:root /tmp/.ICE-unix
[ -n "$SELINUX" ] && restorecon /tmp/.ICE-unix >/dev/null 2>&1
+if [ -x /etc/init.d/diskdump ]; then
+ /etc/init.d/diskdump swapsavecore
+fi
+
# Start up swapping.
update_boot_stage RCswap
action $"Enabling swap space: " swapon -a -e