From 4bd5aa74d537a5dda392de1f1ec2f719173dd08c Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Sat, 24 Oct 2009 23:48:42 +0200 Subject: [PATCH] Disable grub feature by default --- create-netboot | 7 +------ grml-terminalserver-config | 11 ++++++----- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/create-netboot b/create-netboot index bf82832..53319e0 100755 --- a/create-netboot +++ b/create-netboot @@ -8,7 +8,7 @@ isExistent $SHARED_PROG_VARS_ die function actionPkg { local pwd_="$(pwd)" - local tmp_="$(mktemp -td terminalserver_grub.XXXXXX)" || die "could not create tmpfile" + local tmp_="$(mktemp -td terminalserver.XXXXXX)" || die "could not create tmpfile" # version information: local version_="$(cat /etc/grml_version)" @@ -29,11 +29,6 @@ function actionPkg grml-terminalserver config tftp cp -r $TFTPD_DATA_DIR_ $path_ - # grub - awk '/ on$/{print $1}' $GRUB_NIC_CONF_ >$path_/grub_enabled_nics - grml-terminalserver-config grubConf $path_/grub_enabled_nics - cp $PATH_/grub.img $path_ - ( cd "$tmp_" && tar jcf "$pwd_"/grml_netboot_package_${version_}.tar.bz2 "grml_netboot_package_$version_" ) rm -rf "$tmp_" diff --git a/grml-terminalserver-config b/grml-terminalserver-config index 8e8b4c3..cd50d7b 100755 --- a/grml-terminalserver-config +++ b/grml-terminalserver-config @@ -379,11 +379,12 @@ the internet?" fi - # grub - echo -n "" >"$TMP_" - local grub_write_="YES" - $DIALOG_ --clear --backtitle "$BACK_TITLE_" --title "$grub_title_" --yesno "$grub_message_" 5 75 && \ - grubConfig || grub_write_="NO" + # grub -> do not use it anymore + # echo -n "" >"$TMP_" + # local grub_write_="YES" + # $DIALOG_ --clear --backtitle "$BACK_TITLE_" --title "$grub_title_" --yesno "$grub_message_" 5 75 && \ + # grubConfig || grub_write_="NO" + grub_write_="NO" # get options -- 2.1.4