diff options
| -rw-r--r-- | crypttab.5 | 10 | ||||
| -rwxr-xr-x | rc.d/rc.sysinit | 7 |
2 files changed, 7 insertions, 10 deletions
@@ -90,14 +90,18 @@ it has to be entered twice (to prevent typos). The encrypted block device will be used as a swap partition, and will be formatted as a swap partition after setting up the encrypted block device. -The underlying block device must be already formatted -as an (unencrypted) swap partition, -and will be formatted again as an unencrypted swap partition +The underlying block device +will be formatted again as an unencrypted swap partition after destroying the encrypted block device. (This allows sharing a single swap partition between operating system installations, with some of them encrypting the swap partitions and some of them not.) +\fIWARNING\fR: Using the +.B swap +option will destroy the contents of the named partition during every boot, so +make sure the underlying block device is specified correctly. + .PP No options can be specified for LUKS encrypted partitions. 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 |