diff options
| author | pjd <pjd@FreeBSD.org> | 2011-02-27 19:44:10 +0000 |
|---|---|---|
| committer | pjd <pjd@FreeBSD.org> | 2011-02-27 19:44:10 +0000 |
| commit | ea88e61483fdb0d49b73b7d1b11d290295d2764d (patch) | |
| tree | 7503bba3376d7a428ff2267467bccab3eb953ea3 | |
| parent | 1b03c5bf41222b723415638f03e00ed12cac076a (diff) | |
| download | FreeBSD-src-ea88e61483fdb0d49b73b7d1b11d290295d2764d.zip FreeBSD-src-ea88e61483fdb0d49b73b7d1b11d290295d2764d.tar.gz | |
Commit two more files missed in r219089.
MFC after: 1 month
| -rw-r--r-- | Makefile.inc1 | 2 | ||||
| -rwxr-xr-x | etc/rc.d/zvol | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index b1fb79f..3faaece 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1153,6 +1153,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libheimntlm} \ lib/ncurses/ncurses lib/ncurses/ncursesw \ lib/libopie lib/libpam ${_lib_libthr} \ lib/libradius lib/libsbuf lib/libtacplus \ + ${_cddl_lib_libumem} \ lib/libutil ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ ${_secure_lib_libssl} @@ -1166,6 +1167,7 @@ _generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin lib/libopie__L lib/libtacplus__L: lib/libmd__L .if ${MK_CDDL} != "no" +_cddl_lib_libumem= cddl/lib/libumem _cddl_lib= cddl/lib .endif diff --git a/etc/rc.d/zvol b/etc/rc.d/zvol index 62c9015..b52f4ce 100755 --- a/etc/rc.d/zvol +++ b/etc/rc.d/zvol @@ -17,7 +17,6 @@ required_modules="zfs" zvol_start() { - zfs volinit # Enable swap on ZVOLs with property org.freebsd:swap=on. zfs list -H -o org.freebsd:swap,name -t volume | \ while read state name; do @@ -40,7 +39,6 @@ zvol_stop() ;; esac done - zfs volfini } load_rc_config $name |
