diff options
| author | Jonathan Bauer | 2014-07-01 17:33:14 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2014-07-01 17:33:14 +0200 |
| commit | 3215d80c00d21c4ac5c26355d8d6b2a3f24b575d (patch) | |
| tree | 1d13bac2156ec1f9d356d8e004b4f87f31b79b5e /remote/modules/xorg/data | |
| parent | [freiburg] activate kdm-disabled-services (diff) | |
| download | tm-scripts-3215d80c00d21c4ac5c26355d8d6b2a3f24b575d.tar.gz tm-scripts-3215d80c00d21c4ac5c26355d8d6b2a3f24b575d.tar.xz tm-scripts-3215d80c00d21c4ac5c26355d8d6b2a3f24b575d.zip | |
don't split busybox applets in /usr.
all busybox stuff is now under /bin and /sbin. We create links for all
applets in stage32's /bin and /sbin. This fixes the "no such file"
errors caused by hardcoded calls (e.g. /bin/rm) in a some binaries.
Diffstat (limited to 'remote/modules/xorg/data')
| -rwxr-xr-x | remote/modules/xorg/data/etc/X11/Xreset | 2 | ||||
| -rwxr-xr-x | remote/modules/xorg/data/etc/X11/Xsession | 4 | ||||
| -rwxr-xr-x | remote/modules/xorg/data/etc/X11/Xsetup | 2 | ||||
| -rwxr-xr-x | remote/modules/xorg/data/etc/X11/Xstartup | 5 |
4 files changed, 5 insertions, 8 deletions
diff --git a/remote/modules/xorg/data/etc/X11/Xreset b/remote/modules/xorg/data/etc/X11/Xreset index 4ed680ce..3d175a5b 100755 --- a/remote/modules/xorg/data/etc/X11/Xreset +++ b/remote/modules/xorg/data/etc/X11/Xreset @@ -5,7 +5,7 @@ # Xreset - run as root after session exits # -export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/usr/sbin:/opt/openslx/usr/bin:/opt/openslx/sbin:/opt/openslx/bin" +export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/sbin:/opt/openslx/bin" set -e diff --git a/remote/modules/xorg/data/etc/X11/Xsession b/remote/modules/xorg/data/etc/X11/Xsession index b61b9c2f..fadc69ba 100755 --- a/remote/modules/xorg/data/etc/X11/Xsession +++ b/remote/modules/xorg/data/etc/X11/Xsession @@ -5,7 +5,7 @@ # Xsession is executed to start the user's session (as the user) # -export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/usr/sbin:/opt/openslx/usr/bin:/opt/openslx/sbin:/opt/openslx/bin" +export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/sbin:/opt/openslx/bin" PROGNAME=Xsession @@ -94,7 +94,7 @@ case "$1" in *) # Specific program was requested. - STARTUP_FULL_PATH=$(/opt/openslx/usr/bin/which "${1%% *}" || true) + STARTUP_FULL_PATH=$(/opt/openslx/bin/which "${1%% *}" || true) if [ -n "$STARTUP_FULL_PATH" ] && [ -e "$STARTUP_FULL_PATH" ]; then if [ -x "$STARTUP_FULL_PATH" ]; then exec $1 diff --git a/remote/modules/xorg/data/etc/X11/Xsetup b/remote/modules/xorg/data/etc/X11/Xsetup index 524f7d84..b93d7bd6 100755 --- a/remote/modules/xorg/data/etc/X11/Xsetup +++ b/remote/modules/xorg/data/etc/X11/Xsetup @@ -5,7 +5,7 @@ # Xsetup is executed once before the greeter starts (as root) # -export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/usr/sbin:/opt/openslx/usr/bin:/opt/openslx/sbin:/opt/openslx/bin" +export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/sbin:/opt/openslx/bin" SESSIONDIR="/etc/X11/Xsetup.d" diff --git a/remote/modules/xorg/data/etc/X11/Xstartup b/remote/modules/xorg/data/etc/X11/Xstartup index 5631fa65..353c5bb2 100755 --- a/remote/modules/xorg/data/etc/X11/Xstartup +++ b/remote/modules/xorg/data/etc/X11/Xstartup @@ -5,8 +5,5 @@ # Xstartup is executed on successful authentication, before the session is opened (as root) # -export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/usr/sbin:/opt/openslx/usr/bin:/opt/openslx/sbin:/opt/openslx/bin" - - - +export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/sbin:/opt/openslx/bin" |