Permalink
Browse files

Merge branch 'master' of github.com:pcbsd/pcbsd

  • Loading branch information...
2 parents b3ee7b3 + 6b017ea commit 5ea468795c00df8fa81eab1d020cac2f83f2d5e8 Ken committed Sep 12, 2013
Showing with 6 additions and 1 deletion.
  1. +5 −0 src-sh/lpreserver/backend/functions.sh
  2. +1 −1 src-sh/lpreserver/lpreserver
@@ -412,6 +412,11 @@ add_zpool_disk() {
exit 0
fi
+ zpool list -H -v | awk '{print $1}' | grep -q "^$disk"
+ if [ $? -eq 0 ] ; then
+ exit_err "Error: This disk is already apart of a zpool!"
+ fi
+
# Check if pool exists
zpool status $pool >/dev/null 2>/dev/null
if [ $? -ne 0 ] ; then exit_err "Invalid pool: $pool"; fi
@@ -407,7 +407,7 @@ case "$1" in
listcron) help_listcron ;;
listsnap) help_listsnap ;;
revertsnap) help_revertsnap ;;
- zpool) help_zpol ;;
+ zpool) help_zpool ;;
replicate) help_replicate ;;
cronsnap) help_cronsnap ;;
rmsnap) help_rmsnap ;;

0 comments on commit 5ea4687

Please sign in to comment.