id:TransFreeBSD:20050804:p2 id:TransFreeBSD:20050805:p2 id:TransFreeBSD:20050814:p1 の6-currentへの導入

rc.conf R6

削除

gbde_swap_enable="NO"
Set to YES to automatically initialize gbde swap devices listed in fstab with a random one-shot key

追加

# GELI disk encryption configuration.
geli_devices=""
List of devices to automatically attach in addition to GELI devices listed in /etc/fstab.
geli_tries=""
Number of times to attempt attaching geli device. If empty, kern.geom.eli.tries will be used.
geli_default_flags=""
Default flags for geli(8).
geli_autodetach="YES"
Automatically detach on last close. Providers are marked as such when all file systems are mounted.
# Example use.
  • #geli_devices="da1 mirror/home"
  • #geli_da1_flags="-p -k /etc/geli/da1.keys"
  • #geli_da1_autodetach="NO"
  • #geli_mirror_home_flags="-k /etc/geli/home.keys"
geli_swap_flags="-a aes -l 256 -s 4096 -d"
Options for GELI-encrypted swap partitions.

commit log

MFC:

share/man/man5/rc.conf.5
1.258,1.259,1.260
etc/defaults/rc.conf
1.255,1.256,1.257
  • Remove gbde_swap_enable variable (it has no effect).
  • gbde_swap_enable変数（有効ではありません）を削除しました。
  • Add geli_swap_flags variable which holds flags used by geli(8) when configuring GELI-encrypted swap partitions.
  • GELIで暗号化されたスワップパーティションを形成するときに、geli(8)によって使用されるフラグを保持するgeli_swap_flags変数を加えました。
  • Add variables used by rc.d/geli and rc.d/geli2 scripts.
  • rc.d/geliおよびrc.d/geli2スクリプトによって使用される変数を加えました。
Approved by
re (kensmith)

$FreeBSD: src/etc/defaults/rc.conf,v 1.252.2.1 2005/08/16 09:30:13 pjd Exp $