Changeset 13171 in hybrid

Timestamp:

Feb 17, 2015, 9:53:06 PM (10 years ago)

Author:

rick

Message:

Some upgrade options for 10.1-RELEASE

File:

• branches/releng-10/nanobsd/tools/image (modified) (3 diffs)

branches/releng-10/nanobsd/tools/image

@@ -40 +40 @@
 
   prompt_timeout=5
-  p_warn "Going to DEPLOY $img to $host: (8.X-RELEASE and 9.X-RELEASE) to 9.X-RELEASE"
+  p_warn "Going to DEPLOY $img to $host: (and 9.X-RELEASE) to 10.X-RELEASE"
   p_warn "You will need to type the root password at least twice, consider using a key"
   $do_reboot && p_warn "AND will REBOOT the $host"
@@ -50 +50 @@
   echo "# Trying to connect to $host"
   release=`ssh $host 'uname -r'` || exit 1
-  echo "# Host has FreeBSD Release: $release, starting update"
-  if [ "$release" = "9.0-RELEASE" ]; then
-    cat $img | ssh $host /tools/update || exit 1
-  else
+
+  # Release update cycle depends on the release we are coming from
+  echo "# Host has FreeBSD Release: $release"
+  if echo $release | grep -q '^[1234567]\.*-RELEASE'; then
+    p_err "$release not supported for upgrade"
+    exit 1
+  elif echo $release | grep -q '^8\.*-RELEASE'; then
     # Hack to make sure we update the fstab the right way when converting from
     # 8.X-RELEASE to 9.X-RELEASE. ad0 naming changed to ada0, secondly an
@@ -82 +85 @@
     cat $command | ssh $host "cat > $command" || exit 1
     cat $img | ssh $host "sh $command" || exit 1
+  else
+    cat $img | ssh $host /tools/update || exit 1
   fi