Merge pull request #98 from mekanix/feature/import

Fix import script
cbsd · Nov 26, 2019 · feaf7ca · feaf7ca
2 parents 90baaec + 435e7cc
commit feaf7ca
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/scripts/import.sh b/scripts/import.sh
@@ -17,13 +17,13 @@ fi
 
 IMAGE=`basename ${IMAGE_PATH}`
 JAIL=`echo ${IMAGE} | sed 's;\.img$;;'`
+
 trap "rm -rf ${CBSD_WORKDIR}/import/${IMAGE}" HUP INT ABRT BUS TERM  EXIT
+
 cp "${IMAGE_PATH}" "${CBSD_WORKDIR}/import/${IMAGE}"
 if [ "${HYPERVISOR}" = "jail" ]; then
-  echo cbsd jimport "${IMAGE}"
-  cbsd jimport "${IMAGE}"
+  cbsd jimport "${JAIL}"
   cbsd jset jname=${JAIL} host_hostname=${JAIL}.${DOMAIN}
 else
-  echo cbsd bimport "${IMAGE}"
   cbsd bimport "${JAIL}"
 fi