summaryrefslogtreecommitdiffstats
path: root/installer
diff options
context:
space:
mode:
authorDirk von Suchodoletz2006-09-03 15:59:27 +0200
committerDirk von Suchodoletz2006-09-03 15:59:27 +0200
commit42afca10fa4df79e7dfd7ddfe4df21df82ac159c (patch)
tree325bcad9dcccee0faea4ca88cf135e9c6a2ec07b /installer
parentMore cleanups in servconfig ... (diff)
downloadcore-42afca10fa4df79e7dfd7ddfe4df21df82ac159c.tar.gz
core-42afca10fa4df79e7dfd7ddfe4df21df82ac159c.tar.xz
core-42afca10fa4df79e7dfd7ddfe4df21df82ac159c.zip
VMware environment: loopfile and mount will be placed in /etc/vmware
now to avoid problems with nfs and unionfs. Cleanups in vmware-prep script. Introduced new debug level for script runtime calculation, see DebugLevel for further information. Code cleanups in major initramfs scripts, improved /tmp handling in hwautocfg and init ... Removed imgsrv variable (from machine-setup), just merged with the vmware variable (put the vmware image source here ...) git-svn-id: http://svn.openslx.org/svn/openslx/trunk@352 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'installer')
-rw-r--r--installer/default_files/dhcpd.conf3
-rw-r--r--installer/default_files/machine-setup.default3
2 files changed, 4 insertions, 2 deletions
diff --git a/installer/default_files/dhcpd.conf b/installer/default_files/dhcpd.conf
index 38e612f7..12f06df3 100644
--- a/installer/default_files/dhcpd.conf
+++ b/installer/default_files/dhcpd.conf
@@ -105,7 +105,8 @@ group {
option start-snmp "no";
option netbios-workgroup "tux-net";
option tex-enable "yes";
- option vmware "yes";
+ option vmware "no";
+# option vmware "nfs://server/pfad"; # alternative
option desktop-session "kde,gnome";
option language "de_DE de-latin1-nodeadkeys";
# option hw-mouse "ps/2 psaux";
diff --git a/installer/default_files/machine-setup.default b/installer/default_files/machine-setup.default
index de38eb0e..c2991f4a 100644
--- a/installer/default_files/machine-setup.default
+++ b/installer/default_files/machine-setup.default
@@ -81,7 +81,8 @@ netbios_workgroup="dxs-network"
# configure and start vmware services
vmware="no"
-#imgsrv="(proto://)$serverip/dxs/vmware"
+#vmware="(proto://)$serverip/dxs/vmware"
+# imgsrv is deprecated, because incorporated into vmware variable
# kind of X11 display manager to run
start_xdmcp="xdm"