Changeset 10982 in hybrid for branches/releng-9.0/nanobsd/tools

Timestamp:

May 22, 2012, 9:29:00 PM (13 years ago)

Author:

rick

Message:

Horible broke update script for 8.x -> 9.x. Do reverse and apply awefull hack
to make sure we re-write the fstab properly if needed.

File:

• branches/releng-9.0/nanobsd/tools/image (modified) (1 diff)

branches/releng-9.0/nanobsd/tools/image

@@ -45 +45 @@
   sleep $prompt_timeout
 
+  # 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.
-  ssh $HOST 'echo NANO_DRIVE=ada0 > /etc/nanobsd.conf' || exit 1
-  cat $img | ssh $host /tools/update || exit 1
+  if [ "$P" = "p2" ]; then
+    ssh $HOST sed -i "" "s/ada0s1/ada0s2/" /mnt/conf/base/etc/fstab /mnt/etc/fstab || exit 1
+  fi
+
   if $do_reboot; then
     ssh $host reboot