Changeset 11010 in hybrid for branches/releng-9.0/nanobsd

Timestamp:

May 26, 2012, 3:05:45 PM (13 years ago)

Author:

rick

Message:

Reduce update hacking only when needed, saves some potential race conditionals
(and password typing for non-key users).

File:

• branches/releng-9.0/nanobsd/tools/image (modified) (2 diffs)

branches/releng-9.0/nanobsd/tools/image

@@ -43 +43 @@
   $do_reboot && p_warn "AND will REBOOT the $host"
   p_warn "Please do mind to use your ssh key else you be required to type the root"
-  p_warn "password AT LEAST 5 times"
+  p_warn "password AT MOST 5 times"
 
 
@@ -50 +50 @@
 
   # Details and alive checkings
-  ssh $host mount || exit 1
-  P=`ssh $HOST df / | grep '1a ' && echo "p2" || echo "p1"` || exit 1
-  echo "# Updating partition $P"
-
-  cat $img | ssh $host sh -x /tools/update$P || exit 1
-
-  # 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.
-  if [ "$P" = "p2" ]; then
-    cat <<'EOF' | ssh $HOST sh -x || exit 1
+  release=`ssh $host mount | grep 'ada0' && echo "9.0-RELEASE" || echo "PRE-9.0-RELEASE"` || exit 1
+  if [ $release = "9.0-RELEASE" ]; then
+    cat $img | ssh $host sh -x /tools/update || exit 1
+  else
+    # 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.
+    P=`ssh $HOST df / | grep '1a ' && echo "p2" || echo "p1"` || exit 1
+    echo "# Updating partition $P"
+
+    cat $img | ssh $host sh -x /tools/update$P || exit 1
+
+    if [ "$P" = "p2" ]; then
+      cat <<EOF | ssh $HOST sh -x || exit 1
 mount -uwo noatime /dev/ad0s2a
 sed -i "" "s/ada0s1/ada0s2/" /mnt/conf/base/etc/fstab /mnt/etc/fstab
 umount 
 EOF
-
+    fi
   fi