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 | |
| 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')
24 files changed, 35 insertions, 33 deletions
diff --git a/remote/modules/busybox/module.conf b/remote/modules/busybox/module.conf index d2536ac9..6acfa16c 100644 --- a/remote/modules/busybox/module.conf +++ b/remote/modules/busybox/module.conf @@ -4,6 +4,4 @@ REQUIRED_BINARIES="busybox" REQUIRED_DIRECTORIES=" /bin /sbin - /usr/bin - /usr/sbin " diff --git a/remote/modules/busybox/openslx-busybox-config b/remote/modules/busybox/openslx-busybox-config index 57bbb354..29bb29ae 100644 --- a/remote/modules/busybox/openslx-busybox-config +++ b/remote/modules/busybox/openslx-busybox-config @@ -24,7 +24,7 @@ CONFIG_SHOW_USAGE=y # CONFIG_FEATURE_VERBOSE_USAGE is not set CONFIG_FEATURE_COMPRESS_USAGE=y # CONFIG_FEATURE_INSTALLER is not set -# CONFIG_INSTALL_NO_USR is not set +CONFIG_INSTALL_NO_USR=y CONFIG_LOCALE_SUPPORT=y CONFIG_UNICODE_SUPPORT=y # CONFIG_UNICODE_USING_LOCALE is not set diff --git a/remote/modules/cron/vixie-cron-4.1-openslx.tgz b/remote/modules/cron/vixie-cron-4.1-openslx.tgz Binary files differindex 2a9929d4..e2b1108a 100644 --- a/remote/modules/cron/vixie-cron-4.1-openslx.tgz +++ b/remote/modules/cron/vixie-cron-4.1-openslx.tgz diff --git a/remote/modules/idleaction/data/etc/cron.d/openslx-idleaction b/remote/modules/idleaction/data/etc/cron.d/openslx-idleaction index 88230b97..3dd07ccb 100644 --- a/remote/modules/idleaction/data/etc/cron.d/openslx-idleaction +++ b/remote/modules/idleaction/data/etc/cron.d/openslx-idleaction @@ -1,7 +1,7 @@ # Trigger scripts that checks idle status of machine and triggers actions SHELL=/bin/ash -PATH=/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/usr/sbin:/opt/openslx/usr/bin:/opt/openslx/sbin:/opt/openslx/bin +PATH=/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/sbin:/opt/openslx/bin */5 * * * * root /opt/openslx/scripts/idleaction-cron_script diff --git a/remote/modules/idleaction/data/opt/openslx/scripts/idleaction-cron_script b/remote/modules/idleaction/data/opt/openslx/scripts/idleaction-cron_script index b68c27f8..964c49c4 100755 --- a/remote/modules/idleaction/data/opt/openslx/scripts/idleaction-cron_script +++ b/remote/modules/idleaction/data/opt/openslx/scripts/idleaction-cron_script @@ -108,7 +108,7 @@ invalid_time () if [ -n "$SLX_SHUTDOWN_SCHEDULE" -o -n "$SLX_REBOOT_SCHEDULE" ] && [ ! -e "$CRONFILE" ]; then echo "# OpenSLX: Trigger poweroff at certain time of day" > "$CRONFILE" echo "SHELL=/bin/ash" >> "$CRONFILE" - echo "PATH=/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/usr/sbin:/opt/openslx/usr/bin:/opt/openslx/sbin:/opt/openslx/bin" >> "$CRONFILE" + echo "PATH=/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/sbin:/opt/openslx/bin" >> "$CRONFILE" echo "" >> "$CRONFILE" for time in $SLX_SHUTDOWN_SCHEDULE; do HOUR=${time%%:*} diff --git a/remote/modules/kdm/data/etc/systemd/system/kdm.service b/remote/modules/kdm/data/etc/systemd/system/kdm.service index da5e2729..4f8ba944 100644 --- a/remote/modules/kdm/data/etc/systemd/system/kdm.service +++ b/remote/modules/kdm/data/etc/systemd/system/kdm.service @@ -4,7 +4,7 @@ Conflicts=getty@tty7.service After=systemd-user-sessions.service getty@tty7.service setup-slx-addon@nvidia_libs.service [Service] -ExecStartPre=-/opt/openslx/usr/bin/killall fbsplash +ExecStartPre=-/opt/openslx/bin/killall fbsplash ExecStart=/usr/bin/kdm -nodaemon Restart=always IgnoreSIGPIPE=no diff --git a/remote/modules/pam/data/opt/openslx/scripts/pam_script_auth b/remote/modules/pam/data/opt/openslx/scripts/pam_script_auth index 7f29f8fb..48efcf6f 100755 --- a/remote/modules/pam/data/opt/openslx/scripts/pam_script_auth +++ b/remote/modules/pam/data/opt/openslx/scripts/pam_script_auth @@ -1,7 +1,7 @@ #!/bin/ash # Needed as pam_script clears PATH -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" PASSWD=$(getent passwd "$PAM_USER") USER_UID=$(echo "$PASSWD" | awk -F ':' '{print $3}') diff --git a/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_close b/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_close index dc1db852..0af71c6f 100755 --- a/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_close +++ b/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_close @@ -1,7 +1,7 @@ #!/bin/ash # Needed as pam_script clears PATH -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" # NSA needs to know if [ "x$PAM_SERVICE" != "xsu" -a "x$PAM_SERVICE" != "xsudo" ]; then diff --git a/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open b/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open index f272fba1..691210d8 100755 --- a/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open +++ b/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open @@ -1,7 +1,7 @@ #!/bin/ash # Needed as pam_script clears PATH -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" # NSA needs to know if [ "x$PAM_SERVICE" != "xsu" -a "x$PAM_SERVICE" != "xsudo" ]; then diff --git a/remote/modules/qemukvm/data/opt/openslx/scripts/systemd-qemukvm_env b/remote/modules/qemukvm/data/opt/openslx/scripts/systemd-qemukvm_env index 2d1483aa..e19ae1ee 100644 --- a/remote/modules/qemukvm/data/opt/openslx/scripts/systemd-qemukvm_env +++ b/remote/modules/qemukvm/data/opt/openslx/scripts/systemd-qemukvm_env @@ -27,7 +27,7 @@ cat >> /etc/sudoers << EOF # allow to start and stop kvm services / load-/unload kvm modules ALL ALL=NOPASSWD: /opt/openslx/sbin/tunctl -t kvmnet* ALL ALL=NOPASSWD: /opt/openslx/sbin/tunctl -d kvmnet* -ALL ALL=NOPASSWD: /opt/openslx/usr/sbin/brctl addif br0 kvmnet* +ALL ALL=NOPASSWD: /opt/openslx/sbin/brctl addif br0 kvmnet* ALL ALL=NOPASSWD: /opt/openslx/bin/ip link set dev kvmnet* * EOF diff --git a/remote/modules/smartctl/data/etc/cron.d/openslx-smartctl b/remote/modules/smartctl/data/etc/cron.d/openslx-smartctl index 42a251da..a895e8db 100644 --- a/remote/modules/smartctl/data/etc/cron.d/openslx-smartctl +++ b/remote/modules/smartctl/data/etc/cron.d/openslx-smartctl @@ -2,7 +2,7 @@ # this will not trigger, but we check it once on boot anyways. SHELL=/bin/ash -PATH=/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/usr/sbin:/opt/openslx/usr/bin:/opt/openslx/sbin:/opt/openslx/bin +PATH=/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/sbin:/opt/openslx/bin 4 4 * * * root /opt/openslx/scripts/systemd-smartctl 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); diff --git a/remote/modules/vbox/data/etc/udev/rules.d/10-vboxdrv.rules b/remote/modules/vbox/data/etc/udev/rules.d/10-vboxdrv.rules index f2b99721..d200d8f8 100644 --- a/remote/modules/vbox/data/etc/udev/rules.d/10-vboxdrv.rules +++ b/remote/modules/vbox/data/etc/udev/rules.d/10-vboxdrv.rules @@ -1,6 +1,6 @@ KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600" KERNEL=="vboxnetctl", NAME="vboxnetctl", OWNER="root", GROUP="root", MODE="0600" -SUBSYSTEM=="usb_device", ACTION=="add", ENV{PATH}="/usr/bin:/bin:/usr/sbin:/sbin:/opt/openslx/bin:/opt/openslx/usr/bin:/opt/openslx/sbin", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}" -SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", ENV{PATH}="/usr/bin:/bin:/usr/sbin:/sbin:/opt/openslx/bin:/opt/openslx/usr/bin:/opt/openslx/sbin", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}" -SUBSYSTEM=="usb_device", ACTION=="remove", ENV{PATH}="/usr/bin:/bin:/usr/sbin:/sbin:/opt/openslx/bin:/opt/openslx/usr/bin:/opt/openslx/sbin", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" -SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", ENV{PATH}="/usr/bin:/bin:/usr/sbin:/sbin:/opt/openslx/bin:/opt/openslx/usr/bin:/opt/openslx/sbin", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" +SUBSYSTEM=="usb_device", ACTION=="add", ENV{PATH}="/usr/bin:/bin:/usr/sbin:/sbin:/opt/openslx/bin:/opt/openslx/sbin", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}" +SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", ENV{PATH}="/usr/bin:/bin:/usr/sbin:/sbin:/opt/openslx/bin:/opt/openslx/sbin", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}" +SUBSYSTEM=="usb_device", ACTION=="remove", ENV{PATH}="/usr/bin:/bin:/usr/sbin:/sbin:/opt/openslx/bin:/opt/openslx/sbin", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" +SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", ENV{PATH}="/usr/bin:/bin:/usr/sbin:/sbin:/opt/openslx/bin:/opt/openslx/sbin", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" diff --git a/remote/modules/vbox/data/opt/openslx/scripts/systemd-vbox_env b/remote/modules/vbox/data/opt/openslx/scripts/systemd-vbox_env index ece8c9f1..0a854136 100755 --- a/remote/modules/vbox/data/opt/openslx/scripts/systemd-vbox_env +++ b/remote/modules/vbox/data/opt/openslx/scripts/systemd-vbox_env @@ -15,7 +15,7 @@ # - This is the preparation script for the configuration of VirtualBox. ################################################################################ -export PATH="$PATH":/opt/openslx/bin:/opt/openslx/sbin:/opt/openslx/usr/bin:/opt/openslx/usr/sbin +export PATH="$PATH":/opt/openslx/bin:/opt/openslx/sbin VBOX_CONF_DIR=/opt/openslx/etc/vbox VBOXMANAGE=$(which vboxmanage) diff --git a/remote/modules/vbox/module.build b/remote/modules/vbox/module.build index f4a8610a..077edd3d 100644 --- a/remote/modules/vbox/module.build +++ b/remote/modules/vbox/module.build @@ -13,7 +13,7 @@ patch_vbox_scripts() { for i in VBox; do pinfo "Patching virtual box script $i ..." SCRIPTPATH=$(grep -m 1 PATH "${MODULE_BUILD_DIR}/usr/bin/$i"|sed 's/"//g') # assume first hit is real path - sed -i "-i.original" "/^PATH=/c ${SCRIPTPATH}:/opt/openslx/bin:/opt/openslx/usr/bin:/opt/openslx/sbin"\ + sed -i "-i.original" "/^PATH=/c ${SCRIPTPATH}:/opt/openslx/bin:/opt/openslx/sbin"\ "${MODULE_BUILD_DIR}/usr/bin/$i" # append openslx paths done } diff --git a/remote/modules/vmchooser/data/opt/openslx/scripts/systemd-vmchooser_env b/remote/modules/vmchooser/data/opt/openslx/scripts/systemd-vmchooser_env index 04ea4b0d..c39803cd 100755 --- a/remote/modules/vmchooser/data/opt/openslx/scripts/systemd-vmchooser_env +++ b/remote/modules/vmchooser/data/opt/openslx/scripts/systemd-vmchooser_env @@ -20,7 +20,7 @@ ### Define default dirs / get configs ################################################################################ -export PATH=$PATH:/opt/openslx/bin:/opt/openslx/sbin:/opt/openslx/usr/bin:/opt/openslx/usr/sbin +export PATH=$PATH:/opt/openslx/bin:/opt/openslx/sbin # source config file with vars (e.g. ipaddr, macaddr, hostname) . /opt/openslx/config diff --git a/remote/modules/vmchooser2/data/opt/openslx/scripts/systemd-vmchooser_env b/remote/modules/vmchooser2/data/opt/openslx/scripts/systemd-vmchooser_env index 04ea4b0d..c39803cd 100755 --- a/remote/modules/vmchooser2/data/opt/openslx/scripts/systemd-vmchooser_env +++ b/remote/modules/vmchooser2/data/opt/openslx/scripts/systemd-vmchooser_env @@ -20,7 +20,7 @@ ### Define default dirs / get configs ################################################################################ -export PATH=$PATH:/opt/openslx/bin:/opt/openslx/sbin:/opt/openslx/usr/bin:/opt/openslx/usr/sbin +export PATH=$PATH:/opt/openslx/bin:/opt/openslx/sbin # source config file with vars (e.g. ipaddr, macaddr, hostname) . /opt/openslx/config 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" diff --git a/remote/rootfs/rootfs-stage31/data/init b/remote/rootfs/rootfs-stage31/data/init index 1cfc9a98..f8424d33 100755 --- a/remote/rootfs/rootfs-stage31/data/init +++ b/remote/rootfs/rootfs-stage31/data/init @@ -80,7 +80,14 @@ bench_event "STAGE32" "Downloaded stage 3.2" # copy files needed for stage3.2 to FUTURE_ROOT echo "Copying busybox etc. to stage32..." -tar -cp "/bin" "/sbin" "/usr/bin" "/usr/sbin" "/inc/functions" | tar -xp -C "${FUTURE_ROOT}/opt/openslx/" +tar -cp "/bin" "/sbin" "/inc/functions" | tar -xp -C "${FUTURE_ROOT}/opt/openslx/" + +# make all busybox applets available in stage32's /bin /sbin +for b in /bin/* /sbin/*; do + if [ "x$(readlink -f $b)" == "x/bin/busybox" ]; then + ln -s /opt/openslx/bin/busybox /mnt$b + fi +done # set the SLX_ROOT_PASS if given in config if [ ! -z "$SLX_ROOT_PASS" ]; then @@ -105,6 +112,6 @@ unset BOOT_IMAGE initrd KCL ip slxbase slxsrv IPINFO vga ip MAC BOOTIF DEBUG OLD export HOME=/ export init="/usr/lib/systemd/systemd" export recovery= -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" exec /sbin/switch_root -c /dev/console /mnt /usr/lib/systemd/systemd diff --git a/remote/rootfs/rootfs-stage32/module.build b/remote/rootfs/rootfs-stage32/module.build index 62876bc4..86a47fd4 100644 --- a/remote/rootfs/rootfs-stage32/module.build +++ b/remote/rootfs/rootfs-stage32/module.build @@ -85,7 +85,7 @@ post_copy() { # set /etc/environment to include /opt/openslx/bin and /opt/openslx/sbin #add_env PATH "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/sbin:/opt/openslx/bin" - add_env 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" + add_env PATH "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/sbin:/opt/openslx/bin" # set terminal to linux as it defaults to xterm which messes up ssh sessions add_env TERM "linux" |