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

Timestamp:

May 15, 2012, 10:10:24 PM (13 years ago)

Author:

rick

Message:

Set the prompt to avoid confusion. While here merge to ./image framework. So
calling it should be now:

./tools/image edit

Reported-By: huub@
Fixes: nodefactory:ticket:179

Location:

branches/releng-9.0/nanobsd/tools

Files:

• edit-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
+# edit                          - Manually edit the image
 # config [for <node>]           - Configure image to be used for <node>
 # rebuild                       - Rebuild NanoBSD (aka force rebuilding all)
@@ -77 +78 @@
   # Try to fetch and store config
   chroot $mnt /tools/wl-config -d -n -m startup $node_name || exit 1
+}
+
+edit_image() {
+  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
+
+  # Nasty hack to set custom prompt
+  prompt='set prompt = "image# "'
+  echo $prompt >> $mnt/root/.cshrc
+  
+  p_info "Type exit when done"
+  chroot $mnt
+  p_info "Any changes are made permanent on image $img"
+  
+  # Unset prompt again
+  sed -I '' "/^$prompt$/d" $mnt/root/.cshrc
 }
 
@@ -213 +245 @@
   fi
   config_image $node_name
+elif [ "$1" = "edit" ]; then
+  edit_image
 else
   echo "Argument Error - '$1'"; exit 128