Changeset 13425 in hybrid for branches

Timestamp:

Oct 4, 2015, 10:02:22 PM (9 years ago)

Author:

rick

Message:

PoC: update script support for labels

Location:

branches/releng-10/nanobsd/files/tools

Files:

• update.inc.sh (added)
• updatep1 (modified) (1 diff)
• updatep2 (modified) (1 diff)

branches/releng-10/nanobsd/files/tools/updatep1

@@ -43 +43 @@
 fi
 
+. /tools/update.inc.sh
+
 # Blow away old system.
-dd if=/dev/zero of=/dev/${NANO_DRIVE}s1 bs=1m count=1 > /dev/null 2>&1
+dd if=/dev/zero of=/dev/${GEOM_DRIVE}s1 bs=1m count=1 > /dev/null 2>&1
 
 # Copy in new system
-dd of=/dev/${NANO_DRIVE}s1 obs=64k
+dd of=/dev/${GEOM_DRIVE}s1 obs=64k
 
 # Check that it worked
-fsck_ffs -n /dev/${NANO_DRIVE}s1a
+fsck_ffs -n /dev/${GEOM_DRIVE}s1a
 
-gpart set -a active -i 1 ${NANO_DRIVE}
+gpart set -a active -i 1 ${GEOM_DRIVE}
 

branches/releng-10/nanobsd/files/tools/updatep2

@@ -43 +43 @@
 fi
 
+. /tools/update.inc.sh
+
 # Blow away old system.
-dd if=/dev/zero of=/dev/${NANO_DRIVE}s2 bs=1m count=1 > /dev/null 2>&1
+dd if=/dev/zero of=/dev/${GEOM_DRIVE}s2 bs=1m count=1 > /dev/null 2>&1
 
 # Copy in new system
-dd of=/dev/${NANO_DRIVE}s2 obs=64k
+dd of=/dev/${GEOM_DRIVE}s2 obs=64k
+
+# Rebuild UFS label
+if [ -n "${NANO_LABEL}" ]; then
+        tunefs -L ${NANO_LABEL}"s2a" /dev/${GEOM_DRIVE}s2a
+fi
 
 # Check that it worked
-fsck_ffs -n /dev/${NANO_DRIVE}s2a
+fsck_ffs -n /dev/${GEOM_DRIVE}s2a
 
 # Update the /etc/fstab
 trap "umount /mnt" 1 2 15 EXIT
-mount /dev/${NANO_DRIVE}s2a /mnt
-sed -i "" "s/${NANO_DRIVE}s1/${NANO_DRIVE}s2/" /mnt/conf/base/etc/fstab
-sed -i "" "s/${NANO_DRIVE}s1/${NANO_DRIVE}s2/" /mnt/etc/fstab
+mount /dev/${GEOM_DRIVE}s2a /mnt
+sed -i "" "s+${NANO_DRIVE}s1+${NANO_DRIVE}s2+" /mnt/conf/base/etc/fstab
+sed -i "" "s+${NANO_DRIVE}s1+${NANO_DRIVE}s2+" /mnt/etc/fstab
 umount /mnt
 trap 1 2 15 EXIT
 
-gpart set -a active -i 2 ${NANO_DRIVE}
+gpart set -a active -i 2 ${GEOM_DRIVE}