diff options
| author | Root | 2006-11-10 17:15:54 +0100 |
|---|---|---|
| committer | Root | 2006-11-10 17:15:54 +0100 |
| commit | 0f8737691bd096c66f56096c0773248c63993b72 (patch) | |
| tree | bd24e9ae8711b0bd9cc46109d66b2e66245b1681 /initramfs | |
| parent | hwsetup produces links to scd0 instead of sr0, so in presence of (diff) | |
| download | core-0f8737691bd096c66f56096c0773248c63993b72.tar.gz core-0f8737691bd096c66f56096c0773248c63993b72.tar.xz core-0f8737691bd096c66f56096c0773248c63993b72.zip | |
slxgrp changes
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@506 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs')
| -rwxr-xr-x | initramfs/initrd-stuff/bin/servconfig | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/initramfs/initrd-stuff/bin/servconfig b/initramfs/initrd-stuff/bin/servconfig index 237966aa..744c9df9 100755 --- a/initramfs/initrd-stuff/bin/servconfig +++ b/initramfs/initrd-stuff/bin/servconfig @@ -5,7 +5,7 @@ # system is setup when servconfig starts # # Dirk von Suchodoletz <dvs@OpenSLX.com>, 29-10-2006 -# Michael Janczyk <mj0@uni-freiburg.de>, 09-11-2006 +# Michael Janczyk <mj0@uni-freiburg.de>, 10-11-2006 # Lars Mueller <lm@OpenSLX.com>, 23-06-2006 # Oliver Tappe <ot@OpenSLX.com>, 23-06-2006 # @@ -332,13 +332,13 @@ Type=Application" >/mnt/etc/X11/sessions/default.desktop if [ -n "${sessions}" ]; then for i in /mnt/var/lib/vmware/vmsessions/*.desktop; do # only link if in right slxgrp - slxgrpstr=$(cat ${i} | sed -e "s/.*/\L&/;s/slxgrp=/ /;s/$/ /" \ - | sed -n "/^slxgrp/p") - [ `strinstr " ${slxgrp} " "${slxgrpstr}"` ] && slxgrptest="TRUE" + slxgrpstr=$(cat ${i} | sed -e "s/.*/\L&/" | sed -n "/^slxgrp/p" \ + | sed -e "s/slxgrp=/ /;s/$/ /") + slxgrptest="false" + if strinstr " ${slxgrp} " "${slxgrpstr}"; then slxgrptest="true"; fi xdmshow=$(cat ${i}|sed -e "s/.*/\L&/" | sed -n "/^xdm/p"\ |sed -e "s,xdm=,,") - if [ -z "${slxgrp}" -o "${slxgrptest}" = "TRUE" \ - -o "${slxgrp}" = "default" ]; then + if [ -z "${slxgrp}" -o "${slxgrptest}" = "true" ]; then #session_name=$(cat ${i} | grep -iw "exec" \ # | awk -F "=" '{print $2}') session_name=$(cat ${i} | sed -e "s/.*/\L&/" \ |