projects
/
grml-terminalserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get rid of grml2hd specific dialog and code [Closes: issue1117]
[grml-terminalserver.git]
/
shared_prog_vars
diff --git
a/shared_prog_vars
b/shared_prog_vars
index
1fc8270
..
d0c9f3b
100644
(file)
--- a/
shared_prog_vars
+++ b/
shared_prog_vars
@@
-20,6
+20,9
@@
CONFIG_="$PATH_/config"
# 'data dir' from terminalserver
USR_SHARE_="/usr/share/grml-terminalserver"
# 'data dir' from terminalserver
USR_SHARE_="/usr/share/grml-terminalserver"
+# sample config file for making the netboot package
+NETBOOT_PACKAGE_CONF_FILE_="$USR_SHARE_/terminalserver_netboot_package.conf"
+
# defaults for vars in terminalserver.conf
DEFAULT_CONFIG_="$USR_SHARE_/default_config"
# defaults for vars in terminalserver.conf
DEFAULT_CONFIG_="$USR_SHARE_/default_config"
@@
-38,7
+41,12
@@
DIALOG_="dialog"
CONFIG_PROG_="/usr/sbin/grml-terminalserver-config"
# vars for dhcpd
CONFIG_PROG_="/usr/sbin/grml-terminalserver-config"
# vars for dhcpd
-DHCPD_BIN_="/usr/sbin/dhcpd3"
+if [ -x /usr/sbin/dhcpd3 ] ; then
+ DHCPD_BIN_="/usr/sbin/dhcpd3"
+else
+ DHCPD_BIN_="/usr/sbin/dhcpd"
+fi
+
DHCPD_CONFIG_FILE_="$PATH_/dhcpd.conf"
DHCPD_PID_="/var/run/dhcpd.pid"
DHCPD_CONFIG_FILE_="$PATH_/dhcpd.conf"
DHCPD_PID_="/var/run/dhcpd.pid"
@@
-55,12
+63,6
@@
TFTPD_PID_="/var/run/grml-tftpd.pid"
# the dir where the templates for the configuration files are stored
TEMPLATE_CONFIG_DIR_="$USR_SHARE_/templates"
# the dir where the templates for the configuration files are stored
TEMPLATE_CONFIG_DIR_="$USR_SHARE_/templates"
-# this file provides which nic's grub is able to boot from and sane defaults
-GRUB_NIC_CONF_="$USR_SHARE_/grub_cards"
-
-# this file is provided by another debian package (grml-terminalserver-data)
-GRUB_SOURCE_="$USR_SHARE_/grub-0.96.tar.gz"
-
# maximum initrd size
MAX_INITRD_SIZE_=16000
# maximum initrd size
MAX_INITRD_SIZE_=16000