diff options
| author | Oliver Tappe | 2008-05-29 21:07:51 +0200 |
|---|---|---|
| committer | Oliver Tappe | 2008-05-29 21:07:51 +0200 |
| commit | e2cf0313ed022d20d277d2974b72a0b8c91f9df2 (patch) | |
| tree | 3165c7df866f8a34255339e5fb53ce6476f83c5a /initramfs | |
| parent | * finally purged the obsolete folder (diff) | |
| download | core-e2cf0313ed022d20d277d2974b72a0b8c91f9df2.tar.gz core-e2cf0313ed022d20d277d2974b72a0b8c91f9df2.tar.xz core-e2cf0313ed022d20d277d2974b72a0b8c91f9df2.zip | |
* deactivated automatic reactivation of start_xdmcp if start_x is true,
as this clashes with the desktop plugin (which is from now on responsible
for handling desktop managers.
All this should be removed, soon, anyway.
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@1811 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs')
| -rwxr-xr-x | initramfs/initrd-stuff/bin/servconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/initramfs/initrd-stuff/bin/servconfig b/initramfs/initrd-stuff/bin/servconfig index 552b3fd3..928065a3 100755 --- a/initramfs/initrd-stuff/bin/servconfig +++ b/initramfs/initrd-stuff/bin/servconfig @@ -351,7 +351,7 @@ $date\n*\n%hostlist\t$x_display_manager\n*\t\tCHOOSER %hostlist"\ yes|YES|direct|DIRECT|query|QUERY) # direct connection onto the own displaymanager, which # should be enabled then - [ "x$start_xdmcp" = "xno" ] && $start_xdmcp="yes" +# [ "x$start_xdmcp" = "xno" ] && $start_xdmcp="yes" init="" dsx="yes" xdmcp="false" |