save version number in temp files

etc/rc.conf.local

@@ -19,10 +19,11 @@ for i in $tardirs; do
  fi
 done
 
+version=`cat /etc/.flashrd_version`
+
 # Untar one-time files, only once per vnd instance
 if [ -f /etc/.flashrd_onetime -a -f /etc/.flashrd.version ]; then
  onetime=`cat /etc/.flashrd_onetime`
- version=`cat /etc/.flashrd_version`
  if [ "$onetime" -lt "$version" ]; then
   # very unlikely
   echo flashrd: onetime $onetime, version $version
@@ -32,14 +33,14 @@ fi
 
 if [ ! -f /etc/.flashrd_onetime -a -f /flash/onetime.tgz ]; then
  tar xpzf /flash/onetime.tgz -C / 
- touch /etc/.flashrd_onetime
+ echo $version > /etc/.flashrd_onetime
  echo flashrd: onetime extracted
 fi
 
 # Untar on-boot files every time
 if [ ! -f /tmp/.flashrd_onboot -a -f /flash/onboot.tgz ]; then
  tar xpzf /flash/onboot.tgz -C /
- touch /tmp/.flashrd_onboot
+ echo $version > /tmp/.flashrd_onboot
  echo flashrd: onboot extracted
 fi
 

growimg

@@ -33,8 +33,10 @@
 
 unset alt
 
-if [ `uname -s` != "OpenBSD" ]; then
- echo Sorry, cowboy.  This script only runs on OpenBSD.
+uname=`uname -s`
+
+if [ "$uname" != "OpenBSD" -a "$uname" != "Bitrig" ]; then
+ echo Sorry, cowboy.  This script only runs on OpenBSD and similar systems.
  exit 1
 fi