Changeset 13719 in hybrid for branches/releng-11

Timestamp:

Jan 17, 2017, 11:47:43 PM (8 years ago)

Author:

rick

Message:

Quick to allow update on 2nd partition 9->11 migration

File:

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

branches/releng-11/nanobsd/tools/image

@@ -72 +72 @@
   if echo $release | grep -q -e '^9\.[0-9]-RELEASE\(-p[0-9]\{1,2\}\)\?$'; then
     cat >> $updatecmd <<'EOF'
-tunefs -L WLIMGs3 /dev/ada0s3 || exit 1
+. /etc/nanobsd.conf
+NANO_LABEL="WLIMG"
+
+tunefs -L ${NANO_LABEL}s3 /dev/${NANO_DRIVE}s3 || exit 1
 /tools/update || exit 1
+
+# Quirck to fix partition table & label if partion is copied to second image.
+if mount | grep -q ${NANO_DRIVE}s1; then
+        tunefs -L ${NANO_LABEL}s2a /dev/${NANO_DRIVE}s2a || exit 1
+        trap "umount /mnt" 1 2 15 EXIT
+        mount /dev/${NANO_DRIVE}s2a /mnt
+        sed -i "" "s/${NANO_LABEL}s1/${NANO_LABEL}s2/" /mnt/conf/base/etc/fstab
+        sed -i "" "s/${NANO_LABEL}s1/${NANO_LABEL}s2/" /mnt/etc/fstab
+        umount /mnt
+        trap 1 2 15 EXIT
+fi
 EOF
   elif echo $release | grep -q -e '^11\.[0-9]-RELEASE\(-p[0-9]\{1,2\}\)\?$'; then
     cat >> $updatecmd <<'EOF'
-echo /tools/update || exit 1
+/tools/update || exit 1
 EOF
   else