d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit two more files missed in r219089.

Browse Source 
MFC after:	1 month
This commit is contained in:
Pawel Jakub Dawidek 2011-02-27 19:44:10 +00:00
parent 10b9d77bf1
commit 6be04ba681
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.inc1
View File

@ -1153,6 +1153,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libheimntlm} \
lib/ncurses/ncurses lib/ncurses/ncursesw \ lib/ncurses/ncurses lib/ncurses/ncursesw \
lib/libopie lib/libpam ${_lib_libthr} \ lib/libopie lib/libpam ${_lib_libthr} \
lib/libradius lib/libsbuf lib/libtacplus \ lib/libradius lib/libsbuf lib/libtacplus \
${_cddl_lib_libumem} \
lib/libutil ${_lib_libypclnt} lib/libz lib/msun \ lib/libutil ${_lib_libypclnt} lib/libz lib/msun \
${_secure_lib_libcrypto} ${_secure_lib_libssh} \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \
${_secure_lib_libssl} ${_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 lib/libopie__L lib/libtacplus__L: lib/libmd__L
.if ${MK_CDDL} != "no" .if ${MK_CDDL} != "no"
_cddl_lib_libumem= cddl/lib/libumem
_cddl_lib= cddl/lib _cddl_lib= cddl/lib
.endif .endif

2
etc/rc.d/zvol
View File

@ -17,7 +17,6 @@ required_modules="zfs"
zvol_start() zvol_start()
{ {
zfs volinit
# Enable swap on ZVOLs with property org.freebsd:swap=on. # Enable swap on ZVOLs with property org.freebsd:swap=on.
zfs list -H -o org.freebsd:swap,name -t volume | \ zfs list -H -o org.freebsd:swap,name -t volume | \
while read state name; do while read state name; do
@ -40,7 +39,6 @@ zvol_stop()
;; ;;
esac esac
done done
zfs volfini
} }
load_rc_config $name load_rc_config $name