diff options
| author | yar <yar@FreeBSD.org> | 2006-12-31 10:37:18 +0000 |
|---|---|---|
| committer | yar <yar@FreeBSD.org> | 2006-12-31 10:37:18 +0000 |
| commit | dc9f8423c3772111565181a8568c60c4da0a1689 (patch) | |
| tree | 7ed36d4fe8965c59b37bcccfa387cf77469cbeef /etc/rc.d/geli | |
| parent | 58a4c67f05bc56e76c61ca19ed42f2e412cfd55f (diff) | |
| download | FreeBSD-src-dc9f8423c3772111565181a8568c60c4da0a1689.zip FreeBSD-src-dc9f8423c3772111565181a8568c60c4da0a1689.tar.gz | |
Use $required_modules wherever suitable. Use load_kld() in special
cases. So we get rid of quite a few lines of duplicated code.
Diffstat (limited to 'etc/rc.d/geli')
| -rw-r--r-- | etc/rc.d/geli | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/etc/rc.d/geli b/etc/rc.d/geli index f642589..253dbab 100644 --- a/etc/rc.d/geli +++ b/etc/rc.d/geli @@ -34,20 +34,15 @@ . /etc/rc.subr name="geli" +start_precmd='[ -n "$(geli_make_list)" ]' start_cmd="geli_start" stop_cmd="geli_stop" +required_modules="geom_eli:g_eli" geli_start() { devices=`geli_make_list` - # If there are no devices return before loading geom_eli.ko. - if [ -z "${devices}" ]; then - return - fi - - kldstat -q -m g_eli || geli load || err 1 'geom_eli module failed to load.' - if [ -z "${geli_tries}" ]; then if [ -n "${geli_attach_attempts}" ]; then # Compatibility with rc.d/gbde. |
