PSARC 2008/766 native zones p2v
6667924 physical to virtual utility for native zones

@@ -83,10 +83,12 @@
 
 no_install=$(gettext "Could not create install directory '%s'")
 no_log=$(gettext "Could not create log directory '%s'")
 no_logfile=$(gettext "Could not create log file '%s'")
 
+root_full=$(gettext "Zonepath root %s exists and contains data; remove or move aside prior to install.")
+
 install_zone=$(gettext "Installing zone '%s' at root directory '%s'")
 install_from=$(gettext "from archive '%s'")
 
 install_fail=$(gettext "Installation of zone '%s' FAILED.")
 see_log=$(gettext "See the log file:\n  '%s'\nfor details.")

@@ -455,10 +457,19 @@
                 screenlog "$no_install" "$install_root"
                 exit $int_code
         fi
 fi
 
+#
+# Check for a non-empty root.
+# 
+cnt=`ls $install_root | wc -l`
+if [ $cnt -ne 0 ]; then
+        screenlog "$root_full" "$install_root"
+        exit $int_code
+fi
+
 if [[ ! -d "$logdir" ]]
 then
         if ! mkdir -p "$logdir" 2>/dev/null; then
                 screenlog "$no_log" "$logdir"
                 exit $int_code