From 3215d80c00d21c4ac5c26355d8d6b2a3f24b575d Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Tue, 1 Jul 2014 17:33:14 +0200
Subject: 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.
---
 remote/modules/systemd/data/usr/lib/systemd/system/getty@.service | 2 +-
 remote/modules/systemd/systemd-openslx.patch                      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'remote/modules/systemd')

diff --git a/remote/modules/systemd/data/usr/lib/systemd/system/getty@.service b/remote/modules/systemd/data/usr/lib/systemd/system/getty@.service
index 3586e04a..2d2940e1 100644
--- a/remote/modules/systemd/data/usr/lib/systemd/system/getty@.service
+++ b/remote/modules/systemd/data/usr/lib/systemd/system/getty@.service
@@ -25,7 +25,7 @@ IgnoreOnIsolate=yes
 ConditionPathExists=/dev/tty0
 
 [Service]
-ExecStartPre=-/opt/openslx/usr/bin/killall fbsplash
+ExecStartPre=-/opt/openslx/bin/killall fbsplash
 # the VT is cleared by TTYVTDisallocate
 ExecStart=-/sbin/agetty --noclear %I 38400 linux
 Type=idle
diff --git a/remote/modules/systemd/systemd-openslx.patch b/remote/modules/systemd/systemd-openslx.patch
index 36de20b0..ef6cb542 100644
--- a/remote/modules/systemd/systemd-openslx.patch
+++ b/remote/modules/systemd/systemd-openslx.patch
@@ -5,10 +5,10 @@
          setenv("PATH",
  #ifdef HAVE_SPLIT_USR
 -               "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
-+               "/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",
++               "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" ":/opt/openslx/sbin:/opt/openslx/bin",
  #else
 -               "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin",
-+               "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin" ":/opt/openslx/usr/sbin:/opt/openslx/usr/bin:/opt/openslx/sbin:/opt/openslx/bin",
++               "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin" ":/opt/openslx/sbin:/opt/openslx/bin",
  #endif
                 arg_running_as == SYSTEMD_SYSTEM);
  
-- 
cgit v1.2.3-55-g7522