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_
echo "executing grml-terminalserver-config initrd"
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"
+grml-terminalserver (0.94) unstable; urgency=low
+
+ * create-netboot: fix wrong paths of tar.bz2, include version number
+ in the filename of the generated tar.bz2 and inform user about
+ filename of the generated file [Closes: issue376]
+ * grml-terminalserver-config: redirect stdout of update-initramfs
+ to /dev/null and make the code part regarding $PATH_/minirt26.gz
+ more readable.
+
+ -- Michael Prokop <mika@grml.org> Sun, 20 Jan 2008 12:49:06 +0100
+
grml-terminalserver (0.93) unstable; urgency=low
[ Michael Gebetsroither ]
# Authors: grml-team (grml.org), (c) Michael Gebetsroither <gebi@grml.org>
# Bug-Reports: see http://grml.org/bugs/
# License: This file is licensed under the GPL v2.
-# Latest change: Die Mär 27 13:34:47 CEST 2007 [mika]
+# Latest change: Son Jän 20 12:12:44 CET 2008 [mika]
################################################################################
function actionMkInitrd
{
echo -n "Creating initrd $PATH_/minirt26.gz: "
- isExistent "$PATH_/minirt26.gz" && echo && echo "$PATH_/minirt26.gz exists already, skipping initrd creation" && return 0
+ if isExistent "$PATH_/minirt26.gz" ; then
+ echo
+ echo "$PATH_/minirt26.gz exists already, skipping initrd creation"
+ return 0
+ fi
+
if [ -e '/live/cow' ]; then
mkInitrdNew
else
local tmp_="`mktemp -t terminalserver__initramfsbk.XXXXXX`"
cp $cfg_ $tmp_
sed -i 's/^MODULES=.*/MODULES=netboot/' $cfg_
- update-initramfs -u -t
+ update-initramfs -u -t 1>/dev/null
mv $tmp_ $cfg_
local initrd_="/boot/initrd.img-$KERNEL_VERSION_"