diff options
9 files changed, 16 insertions, 16 deletions
diff --git a/remote/modules/busybox/busybox.conf b/remote/modules/busybox/busybox.conf index f7c866f2..04f31b23 100644 --- a/remote/modules/busybox/busybox.conf +++ b/remote/modules/busybox/busybox.conf @@ -1,5 +1,5 @@ GIT=git://git.openslx.org/openslx/tools/busybox -PREFIX="/openslx" +PREFIX="/opt/openslx/busybox" REQUIRED_BINARIES=" busybox" REQUIRED_DIRECTORIES=" ${PREFIX}/bin ${PREFIX}/sbin diff --git a/remote/modules/systemd/data/etc/systemd/system/debug-shell.service b/remote/modules/systemd/data/etc/systemd/system/debug-shell.service index 5b7d5de9..f702064d 100644 --- a/remote/modules/systemd/data/etc/systemd/system/debug-shell.service +++ b/remote/modules/systemd/data/etc/systemd/system/debug-shell.service @@ -13,7 +13,7 @@ IgnoreOnIsolate=yes [Service] Environment=TERM=linux -EnvironmentPath=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/openslx/sbin:/openslx/bin:/openslx/usr/sbin:/openslx/usr/bin +EnvironmentPath=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/sbin:/opt/openslx/bin:/opt/openslx/usr/sbin:/opt/openslx/usr/bin ExecStart=/bin/sh Restart=always RestartSec=0 diff --git a/remote/modules/systemd/data/etc/systemd/system/load-german-keymap.service b/remote/modules/systemd/data/etc/systemd/system/load-german-keymap.service index 74753259..fa4cf5f2 100644 --- a/remote/modules/systemd/data/etc/systemd/system/load-german-keymap.service +++ b/remote/modules/systemd/data/etc/systemd/system/load-german-keymap.service @@ -2,4 +2,4 @@ Description=Setup german keyboard layout [Service] -ExecStart=/bin/bash -c 'exec /openslx/sbin/loadkmap < /etc/keymaps/de_DE' +ExecStart=/bin/bash -c 'exec /opt/openslx/sbin/loadkmap < /etc/keymaps/de_DE' diff --git a/remote/modules/systemd/data/etc/systemd/system/network-interface@.service b/remote/modules/systemd/data/etc/systemd/system/network-interface@.service index 137b3af6..13a30bbc 100644 --- a/remote/modules/systemd/data/etc/systemd/system/network-interface@.service +++ b/remote/modules/systemd/data/etc/systemd/system/network-interface@.service @@ -5,4 +5,4 @@ Before=udhcpc@%i.service [Service] Type=simple -ExecStart=/openslx/bin/ip link set dev %I up +ExecStart=/opt/openslx/bin/ip link set dev %I up diff --git a/remote/modules/systemd/data/etc/systemd/system/udhcpc@.service b/remote/modules/systemd/data/etc/systemd/system/udhcpc@.service index a945e743..af4c70bb 100644 --- a/remote/modules/systemd/data/etc/systemd/system/udhcpc@.service +++ b/remote/modules/systemd/data/etc/systemd/system/udhcpc@.service @@ -3,7 +3,7 @@ Description=DHCP Client [Service] Type=simple -ExecStart=/openslx/sbin/udhcpc -O domain -O nissrv -O nisdomain -O wpad -t 8 -s /etc/udhcpc.openslx.script -i %I +ExecStart=/opt/openslx/sbin/udhcpc -O domain -O nissrv -O nisdomain -O wpad -t 8 -s /etc/udhcpc.openslx.script -i %I [Install] WantedBy=multi-user.target diff --git a/remote/rootfs/rootfs-stage32/data/etc/profile b/remote/rootfs/rootfs-stage32/data/etc/profile index ff29e9c5..a9b85a9c 100644 --- a/remote/rootfs/rootfs-stage32/data/etc/profile +++ b/remote/rootfs/rootfs-stage32/data/etc/profile @@ -5,10 +5,10 @@ export PATH=\ /sbin:\ /usr/bin:\ /usr/sbin:\ -/openslx/bin:\ -/openslx/sbin:\ -/openslx/usr/bin:\ -/openslx/usr/sbin +/opt/openslx/bin:\ +/opt/openslx/sbin:\ +/opt/openslx/usr/bin:\ +/opt/openslx/usr/sbin # If running interactively, then: if [ "$PS1" ]; then diff --git a/remote/rootfs/rootfs-stage32/data/etc/udhcpc.openslx.script b/remote/rootfs/rootfs-stage32/data/etc/udhcpc.openslx.script index b4cd0ee5..773a7370 100755 --- a/remote/rootfs/rootfs-stage32/data/etc/udhcpc.openslx.script +++ b/remote/rootfs/rootfs-stage32/data/etc/udhcpc.openslx.script @@ -20,7 +20,7 @@ RESOLV_CONF="/etc/resolv.conf" IP_CONF="/tmp/udhcpc_ip_config" -export PATH=$PATH:/openslx/sbin:/openslx/bin +export PATH=$PATH:/opt/openslx/sbin:/opt/openslx/bin set >> /root/udhcpc_args diff --git a/remote/rootfs/rootfs-stage32/data/usr/sbin/mountexport b/remote/rootfs/rootfs-stage32/data/usr/sbin/mountexport index 61176364..cc08728e 100755 --- a/remote/rootfs/rootfs-stage32/data/usr/sbin/mountexport +++ b/remote/rootfs/rootfs-stage32/data/usr/sbin/mountexport @@ -1,6 +1,6 @@ #!/bin/bash -export PATH=$PATH:/openslx/usr/sbin:/openslx/usr/bin:/openslx/sbin:/openslx/bin +export PATH=$PATH:/opt/openslx/usr/sbin:/opt/openslx/usr/bin:/opt/openslx/sbin:/opt/openslx/bin if grep "Ubuntu" "/etc/issue" >/dev/null; then EXPORT="132.230.8.113:/srv/ubuntu1304" @@ -11,7 +11,7 @@ else exit 1 fi -echo "Mounting ${EXPORT} to /openslx/mnt" -mount -t nfs -o ro,async,nolock,vers=3 "$EXPORT" /openslx/mnt || { echo "Fail." && exit 1; } -echo "Appending /openslx/mnt to /" -mount -o remount,append:/openslx/mnt=ro / || { echo "Fail." && exit 1; } +echo "Mounting ${EXPORT} to /opt/openslx/mnt" +mount -t nfs -o ro,async,nolock,vers=3 "$EXPORT" /opt/openslx/mnt || { echo "Fail." && exit 1; } +echo "Appending /opt/openslx/mnt to /" +mount -o remount,append:/opt/openslx/mnt=ro / || { echo "Fail." && exit 1; } diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.build b/remote/rootfs/rootfs-stage32/rootfs-stage32.build index 164a3464..fe0a32ad 100644 --- a/remote/rootfs/rootfs-stage32/rootfs-stage32.build +++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.build @@ -63,7 +63,7 @@ post_copy() { "${TARGET_BUILD_DIR}"/dev || perror "Copying devices from running system failed." # set /etc/environment to include /openslx/bin and /openslx/sbin - echo "PATH=\"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/openslx/sbin:/openslx/bin\"" \ + echo "PATH=\"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/sbin:/opt/openslx/bin\"" \ > "${TARGET_BUILD_DIR}/etc/environment" # copy static files |