aboutsummaryrefslogtreecommitdiffstats
path: root/rc.d
diff options
context:
space:
mode:
authorMiloslav Trmac <mitr@volny.cz>2006-07-24 19:49:06 +0000
committerMiloslav Trmac <mitr@volny.cz>2006-07-24 19:49:06 +0000
commit8ebf0a43d2df1b47d6404d33518c1654d740cf73 (patch)
tree97cdfdb9ac6e4d9dd3d93df80af3c25a4769907f /rc.d
parentfd8bb5dac2fb70a9d1724cc750d9abb6670e212d (diff)
downloadinitscripts-8ebf0a43d2df1b47d6404d33518c1654d740cf73.tar
initscripts-8ebf0a43d2df1b47d6404d33518c1654d740cf73.tar.gz
initscripts-8ebf0a43d2df1b47d6404d33518c1654d740cf73.tar.bz2
initscripts-8ebf0a43d2df1b47d6404d33518c1654d740cf73.tar.xz
initscripts-8ebf0a43d2df1b47d6404d33518c1654d740cf73.zip
Don't require encrypted swap partitions to be swap formated before setting
them up (#127378)
Diffstat (limited to 'rc.d')
-rwxr-xr-xrc.d/rc.sysinit7
1 files changed, 0 insertions, 7 deletions
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index fd8ae8df..e48d700b 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -178,13 +178,6 @@ init_crypto() {
ret=1
continue
fi
- if [ "$makeswap" = "yes" ]; then
- # init.d/halt should format $src as swap before shutdown
- if [ "$(/sbin/blkid -o value -s TYPE "$src")" != "swap" ]; then
- echo $"$src is not a swap partition"
- makeswap=no
- fi
- fi
if [ -z "$key" -a -x /usr/bin/rhgb-client ] \
&& /usr/bin/rhgb-client --ping ; then
chvt 1