projects
/
grml-terminalserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/mika/do-not-build-initrd'
[grml-terminalserver.git]
/
shared_prog_vars
diff --git
a/shared_prog_vars
b/shared_prog_vars
index
51d927b
..
d0c9f3b
100644
(file)
--- a/
shared_prog_vars
+++ b/
shared_prog_vars
@@
-1,5
+1,3
@@
-#!/bin/sh i like syntaxhighlighting ;)
-# this is a shellscript fragment
# !!! DO NOT EDIT THIS FILE !!!
# only if you know what you are doing...
# !!! DO NOT EDIT THIS FILE !!!
# only if you know what you are doing...
@@
-22,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"
@@
-40,12
+41,17
@@
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_CONFIG_FILE_="$PATH_/dhcpd.conf"
-DHCPD_PID_=
/var/run/dhcpd.pid
+DHCPD_PID_=
"/var/run/dhcpd.pid"
# vars for tftpd
# vars for tftpd
-TFTPD_BIN_="/usr/sbin/
in.
tftpd"
+TFTPD_BIN_="/usr/sbin/
a
tftpd"
TFTPD_DATA_DIR_="/var/lib/tftpboot"
TFTPD_PID_="/var/run/grml-tftpd.pid"
TFTPD_DATA_DIR_="/var/lib/tftpboot"
TFTPD_PID_="/var/run/grml-tftpd.pid"
@@
-57,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
@@
-75,3
+75,6
@@
INITRD_="$PATH_/mini-root"
# only for this cards (kernel module names of drivers) drivers are copied into
# the initrd
CARDS_DETECTED_BY_DISCOVER="$PATH_/discover_netcards"
# only for this cards (kernel module names of drivers) drivers are copied into
# the initrd
CARDS_DETECTED_BY_DISCOVER="$PATH_/discover_netcards"
+
+# as long as this pattern is in a config file, it will be overwritten every time
+CONFIG_PATTERN_="__PLEASE_UPDATE_THIS_FILE__"