Permalink
Browse files

Commit two more files missed in r219089.

MFC after:	1 month
  • Loading branch information...
1 parent cc52e2a commit 3e5e3d09f58b6713987bdcd77554af8d6cf891de pjd committed Feb 27, 2011
Showing with 2 additions and 2 deletions.
  1. +2 −0 Makefile.inc1
  2. +0 −2 etc/rc.d/zvol
View
@@ -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
View
@@ -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

0 comments on commit 3e5e3d0

Please sign in to comment.