X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=create-netboot;h=bf82832e58225ca4cc8c5e3d44cf339fc4de6f24;hb=295888a08ac807c45a142e63394300842e7fdfcb;hp=1b5131a388b4a010416e1d284744e668d352b219;hpb=e5b7518cdb1687997e387078fd5a6755c0ac461f;p=grml-terminalserver.git

diff --git a/create-netboot b/create-netboot
index 1b5131a..bf82832 100755
--- a/create-netboot
+++ b/create-netboot
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 . /etc/grml/sh-lib
 SHARED_PROG_VARS_="/usr/share/grml-terminalserver/shared_prog_vars"
@@ -7,13 +7,21 @@ isExistent $SHARED_PROG_VARS_ die
 
 function actionPkg
 { 
-    local tmp_=`mktemp -td terminalserver_grub.XXXXXX` || die "could not create tmpfile"
-    local version_="`cat /etc/grml_version`"
-    version_=${version_%% *}
+    local pwd_="$(pwd)"
+    local tmp_="$(mktemp -td terminalserver_grub.XXXXXX)" || die "could not create tmpfile"
+
+    # version information:
+    local version_="$(cat /etc/grml_version)"
+    local version_number_="$(awk '{print $2}' /etc/grml_version)"
+    case $version_number_ in
+         [0-9]*) version_="${version_%% *}"_${version_number_} ;;
+         *)      version_="${version_%% *}" ;;
+    esac
+    
     local path_="$tmp_/grml_netboot_package_$version_"
-    mkdir $path_
+    mkdir "$path_"
 
-    cp $NETBOOT_PACKAGE_CONF_FILE_ $CONFIG_
+    cp $NETBOOT_PACKAGE_CONF_FILE_ $CONF_FILE_
     echo "executing grml-terminalserver-config initrd"
     grml-terminalserver-config initrd
 
@@ -26,11 +34,10 @@ function actionPkg
     grml-terminalserver-config grubConf $path_/grub_enabled_nics
     cp $PATH_/grub.img $path_
 
-    pushd $tmp_
-    tar cjf grml_netboot_package_${version_}.tar.bz2 $path_
-    popd
-    mv -b $tmp_/grml_netboot_package_${version_}.tar.bz2 .
-    rm -rf $tmp_
+    ( cd "$tmp_" && tar jcf "$pwd_"/grml_netboot_package_${version_}.tar.bz2 "grml_netboot_package_$version_" )
+
+    rm -rf "$tmp_"
+    echo "grml_netboot_package_${version_}.tar.bz2 has been created."
 }
 
 checkRoot die "You have to be root to use this program"