From 5e8fac29dae670a4d83a67d4394b9d7cb46afdb9 Mon Sep 17 00:00:00 2001
From: Filipp Lepalaan <filipp@mac.com>
Date: Wed, 15 Dec 2010 13:09:10 +0200
Subject: better netbless

---
 hellyes.command |  2 +-
 netbless.sh     | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/hellyes.command b/hellyes.command
index bb4076b..d6a0ef8 100755
--- a/hellyes.command
+++ b/hellyes.command
@@ -2,7 +2,7 @@
 # hellyeah.command
 # Do some stress testing
 # @author Filipp Lepalaan <filipp@mcare.fi>
-# @copyright No (c), Public Domain software
+# @package mtk
 
 MYDIR=/private/tmp/_hellyeah
 CORES=$(sysctl hw.logicalcpu_max | cut -d : -f 2 | sed 's/ //')
diff --git a/netbless.sh b/netbless.sh
index c9b5ad5..934a975 100755
--- a/netbless.sh
+++ b/netbless.sh
@@ -15,10 +15,10 @@ if [[ $1 == "help" ]]; then
 fi
 
 SERVER_PATH=${3:-"/data/nb"}
-SERVER=${2:-"http://sw.mcare.fi/mh/"}
+SERVER=${2:-"sw.mcare.fi"}
 SERVER_IP=$(/usr/bin/dig +short ${SERVER})
 
-ME=$(/usr/sbin/sysctl -n hw.model)
+ME=${1:-$(/usr/sbin/sysctl -n hw.model)}
 MACHINE=$(sysctl -n hw.machine)
 
 if [[ $MACHINE == "x86_64" ]]; then
@@ -30,7 +30,7 @@ if [[ -z $ME ]]; then
   exit 1
 fi
 
-IMAGES=$(/usr/bin/curl -s ${SERVER})
+IMAGES=$(/usr/bin/curl -s http://${SERVER}/mh/)
 
 if [[ $1 == "list" ]]; then
   echo -e "Available images: [${IMAGES}]" 2>&1
@@ -45,8 +45,8 @@ do
     --booter tftp://${SERVER_IP}/${IMG}/${MACHINE}/booter \
     --kernel tftp://${SERVER_IP}/${IMG}/${MACHINE}/mach.macosx \
     --options "rp=nfs:${SERVER_IP}:${SERVER_PATH}:/${IMG}/NetInstall.dmg" \
-    --nextonly \
-    echo "Startup volume set to ${ME}.nbi"
+    --nextonly
+    echo "Startup volume set to ${ME}"
     exit 0
   fi
 done
-- 
cgit v1.2.3