diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index b76df95c2228..ed17c052e64a 100755 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -8,9 +8,9 @@ FILES= DAEMON LOGIN NETWORKING SERVERS \ ccd cleanvar cleartmp cron \ devd devfs dhclient \ dmesg dumpon \ - early.sh \ + early.sh encswap \ fsck \ - gbde gbde_swap \ + gbde \ hostname \ ike \ inetd initrandom \ diff --git a/etc/rc.d/gbde_swap b/etc/rc.d/gbde_swap deleted file mode 100644 index 82ac8da45f1a..000000000000 --- a/etc/rc.d/gbde_swap +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: disks -# REQUIRE: initrandom -# KEYWORD: nojail - -. /etc/rc.subr - -name="gbde_swap" -start_cmd="gbde_swap_attach" -stop_cmd="gbde_swap_detach" - -gbde_swap_attach() -{ - while read device mountpoint type options rest ; do - case ":${device}:${type}:${options}" in - :#*) - continue - ;; - *.bde:swap:sw) - ;; - *) - continue - ;; - esac - passphrase=`dd if=/dev/random count=1 2>/dev/null | md5 -q` - device="${device%.bde}" - gbde init "${device}" -P "${passphrase}" || return 1 - gbde attach "${device}" -p "${passphrase}" || return 1 - done < /etc/fstab -} - -gbde_swap_detach() -{ - while read device mountpoint type options rest ; do - case ":${device}:${type}:${options}" in - :#*) - continue - ;; - *.bde:swap:sw) - ;; - *) - continue - ;; - esac - device="${device%.bde}" - gbde detach "${device}" - done < /etc/fstab -} - -load_rc_config $name -run_rc_command "$1"