Date: Sun, 27 Feb 2011 19:44:10 +0000 (UTC) From: Pawel Jakub Dawidek <pjd@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r219090 - in head: . etc/rc.d Message-ID: <201102271944.p1RJiAEK000476@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pjd Date: Sun Feb 27 19:44:10 2011 New Revision: 219090 URL: http://svn.freebsd.org/changeset/base/219090 Log: Commit two more files missed in r219089. MFC after: 1 month Modified: head/Makefile.inc1 head/etc/rc.d/zvol Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Sun Feb 27 19:41:40 2011 (r219089) +++ head/Makefile.inc1 Sun Feb 27 19:44:10 2011 (r219090) @@ -1153,6 +1153,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1 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 ${_k lib/libopie__L lib/libtacplus__L: lib/libmd__L .if ${MK_CDDL} != "no" +_cddl_lib_libumem= cddl/lib/libumem _cddl_lib= cddl/lib .endif Modified: head/etc/rc.d/zvol ============================================================================== --- head/etc/rc.d/zvol Sun Feb 27 19:41:40 2011 (r219089) +++ head/etc/rc.d/zvol Sun Feb 27 19:44:10 2011 (r219090) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201102271944.p1RJiAEK000476>