diff options
| author | Dirk von Suchodoletz | 2007-02-01 01:01:15 +0100 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2007-02-01 01:01:15 +0100 |
| commit | 4e049941fd73ccd651c417a722d7099de1e0ef67 (patch) | |
| tree | 6779ae7a6dd9ef62d94a0489d98d99ec556535b3 /initramfs/initrd-stuff/bin/servconfig | |
| parent | mksquashfs (regex) filters patch (to be tested, see #86) ... (diff) | |
| download | core-4e049941fd73ccd651c417a722d7099de1e0ef67.tar.gz core-4e049941fd73ccd651c417a722d7099de1e0ef67.tar.xz core-4e049941fd73ccd651c417a722d7099de1e0ef67.zip | |
Some thoughts on Gentoo integration ... (minor cleanups in init
and servconfig)
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@664 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs/initrd-stuff/bin/servconfig')
| -rwxr-xr-x | initramfs/initrd-stuff/bin/servconfig | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/initramfs/initrd-stuff/bin/servconfig b/initramfs/initrd-stuff/bin/servconfig index cbe7b187..43ed0796 100755 --- a/initramfs/initrd-stuff/bin/servconfig +++ b/initramfs/initrd-stuff/bin/servconfig @@ -347,8 +347,7 @@ Type=Application" >/mnt/etc/X11/sessions/default.desktop for i in /mnt/var/lib/vmware/vmsessions/*.desktop; do # only link if in right slxgrp slxgrpstr=$(sed \ - 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/;/slxgrp=/!d' ${i} \ - | sed '$!d;s/slxgrp=//') + 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/;/slxgrp=/!d' \ ${i} | sed '$!d;s/slxgrp=//') slxgrptest="false" # FIXME: maybe logfile sometime ;) #echo "=${slxgrpstr}=" @@ -424,7 +423,6 @@ if [ -n "$scratch" -a -z "$tmpisdisk" ] ; then ;; esac fi -chmod 1777 /mnt/tmp ############################################################################# # X11/GUI stuff @@ -438,7 +436,7 @@ if [ "x$start_x" != "xno" ] ; then /var/run/xdmctl \ /tmp/.ICE-unix \ /tmp/.X11-unix ; do testmkd /mnt/$i; done - chmod a+rwxt /mnt/tmp/.ICE-unix /mnt/tmp/.X11-unix + chmod 1777 /mnt/tmp/.ICE-unix /mnt/tmp/.X11-unix echo "# file emtied by $0 during initramfs" > /mnt/etc/X11/xdm/Xservers # define additional sessions offered to the user (via dhcp/ldap config) # descsession -> deprecated by new vmware integration concept |