diff options
| author | hrs <hrs@FreeBSD.org> | 2013-06-27 18:28:45 +0000 |
|---|---|---|
| committer | hrs <hrs@FreeBSD.org> | 2013-06-27 18:28:45 +0000 |
| commit | 8a3748f531c8740f607c4699474b610e9fd67f6c (patch) | |
| tree | 7de5a51b2bb632b781318a008e0d7c347c3065e4 /etc/defaults | |
| parent | 7f729239c4bb884a13e00c42f6ad2bf2068059d0 (diff) | |
| download | FreeBSD-src-8a3748f531c8740f607c4699474b610e9fd67f6c.zip FreeBSD-src-8a3748f531c8740f607c4699474b610e9fd67f6c.tar.gz | |
- Add vnode-backed swap space specification support. This is enabled when
device names "md" or "md[0-9]*" and a "file" option are specified in
/etc/fstab like this:
md none swap sw,file=/swap.bin 0 0
- Add GBDE/GELI encrypted swap space specification support, which
rc.d/encswap supported. The /etc/fstab lines are like the following:
/dev/ada1p1.bde none swap sw 0 0
/dev/ada1p2.eli none swap sw 0 0
.eli devices accepts aalgo, ealgo, keylen, and sectorsize as options.
swapctl(8) can understand an encrypted device in the command line
like this:
# swapctl -a /dev/ada2p1.bde
- "-L" flag is added to support "late" option to defer swapon until
rc.d/mountlate runs.
- rc.d script change:
rc.d/encswap -> removed
rc.d/addswap -> just display a warning message if $swapfile is defined
rc.d/swap1 -> renamed to rc.d/swap
rc.d/swaplate -> newly added to support "late" option
These changes alleviate a race condition between device creation/removal
and swapon/swapoff.
MFC after: 1 week
Reviewed by: wblock (manual page)
Diffstat (limited to 'etc/defaults')
| -rw-r--r-- | etc/defaults/rc.conf | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf index 687b092..dda1855 100644 --- a/etc/defaults/rc.conf +++ b/etc/defaults/rc.conf @@ -32,8 +32,6 @@ early_late_divider="FILESYSTEMS" # Script that separates early/late always_force_depends="NO" # Set to check that indicated dependencies are # running during boot (can increase boot time). -swapfile="NO" # Set to name of swapfile if aux swapfile desired. -swapfile_mdunit="99" # Swapfile md(4) unit number created by mdconfig(8). apm_enable="NO" # Set to YES to enable APM BIOS functions (or NO). apmd_enable="NO" # Run apmd to handle APM event from userland. apmd_flags="" # Flags to apmd (if enabled). @@ -85,9 +83,6 @@ geli_autodetach="YES" # Automatically detach on last close. #geli_da1_autodetach="NO" #geli_mirror_home_flags="-k /etc/geli/home.keys" -geli_swap_flags="-e aes -l 256 -s 4096 -d" # Options for GELI-encrypted - # swap partitions. - root_rw_mount="YES" # Set to NO to inhibit remounting root read-write. fsck_y_enable="NO" # Set to YES to do fsck -y if the initial preen fails. fsck_y_flags="" # Additional flags for fsck -y |
