summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2005-06-21 20:17:54 +0000
committerBill Nottingham <notting@redhat.com>2005-06-21 20:17:54 +0000
commitb0b44bd79aa0141de353058e33c101324372c6fc (patch)
tree60a8b13efb7bb49bbea4f25b814dbf39fa4aabe8
parent7b611457c116df85408790042ad5b190419cf43f (diff)
downloadinitscripts-b0b44bd79aa0141de353058e33c101324372c6fc.tar.gz
initscripts-b0b44bd79aa0141de353058e33c101324372c6fc.tar.xz
initscripts-b0b44bd79aa0141de353058e33c101324372c6fc.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 615d87d9..47d324d4 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -21,7 +21,7 @@ Conflicts: mkinitrd < 4.0
Conflicts: timeconfig < 3.0, ppp < 2.3.9, wvdial < 1.40-3
Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, kbd < 1.06-19, lokkit < 0.50-14
Conflicts: udev < 0:032
-Conflicts: tcsh < 6.13-5
+Conflicts: tcsh < 6.13-5, diskdumputils < 1.1.0
Obsoletes: rhsound sapinit
Prereq: /sbin/chkconfig, /usr/sbin/groupadd, gawk, fileutils, sh-utils
BuildPrereq: glib2-devel popt gettext pkgconfig
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 844b3cbd..fc9397fe 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -838,6 +838,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