Changeset 10830 in hybrid for branches

Timestamp:

May 13, 2012, 2:10:04 PM (13 years ago)

Author:

rick

Message:

Merge config into tools/image

Location:

branches/releng-9.0/nanobsd/tools

Files:

• config-image.sh (deleted)
• image (modified) (3 diffs)

branches/releng-9.0/nanobsd/tools/image

@@ -20 +20 @@
 # build force kernel            - Build NanoBSD and force rebuilding the kernel
 # build force world             - Build NanoBSD and force rebuilding world
+# config [for <node>]           - Configure image to be used for <node>
 # rebuild                       - Rebuild NanoBSD (aka force rebuilding all)
 # deploy on <node> [and reboot] - Deploy the image on node and reboot if needed
@@ -51 +52 @@
     ssh $host reboot
   fi
+}
+
+config_image() {
+  node_name=${1:+"-b -c $1"}
+
+  img=$OBJDIR/_.disk.full
+
+  mnt=`mktemp -d -t $(basename $0)`
+  md=`mdconfig -a -t vnode -f $img`
+  
+  # Clean up when done
+  trap "umount $mnt/dev; umount $mnt/cfg; umount $mnt; mdconfig -d -u $md; rm -d $mnt" 0
+  trap "exit 1" 1 2 3 15
+
+  # Root filesystem
+  mount /dev/${md}s1a $mnt || exit 1
+
+  # /dev/null in chroot
+  mount -t devfs devfs ${mnt}/dev || exit 1
+  
+  # Config files lives at /cfg  location
+  mount /dev/${md}s3 $mnt/cfg || exit 1
+  
+  # Try to fetch and store config
+  chroot $mnt /tools/wl-config -d -n -m startup $node_name || exit 1
 }
 
@@ -176 +202 @@
     echo "Arguments Error - '$*'"; exit 128
   fi
+elif [ "$1" = "config" ]; then
+  if [ "$2" = "for" ]; then
+    if [ -n "$3" ]; then
+      node_name=$3
+    else
+      echo "Arguments Error - '$*'"; exit 128
+    fi
+  else
+    echo "Arguments Error - '$*'"; exit 128
+  fi
+  config_image $node_name
 else
   echo "Argument Error - '$1'"; exit 128