Merge pull request #15 from RainbowHackerHorse/bugfix/globcheck-for-l…

…sb_release Add vzvol_existondisk, and fix the pkgcheck for lsb_release
RainbowHackerHorse · Dec 30, 2017 · 042995f · 042995f
2 parents a9f3c7d + a70b433
commit 042995f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/lib/linux/vzvol_pkgcheck.sh b/lib/linux/vzvol_pkgcheck.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 vzvol_pkg_check_linux(){
-	ls /usr/bin | grep -q lsb_release
-	if [ $? = 0 ]; then
+	if [ -e /usr/bin/lsb_release ]; then
 		vzvol_pkg_lsb
 	else
 		vzvol_pkg_distrocheck

diff --git a/lib/shared/vzvol_existondisk.sh b/lib/shared/vzvol_existondisk.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+vzvol_existondisk() {
+	eval set -- "$1"; [ -e "$1" ];
+}