summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--core-services/02-udev.sh4
-rw-r--r--core-services/03-filesystems.sh6
-rw-r--r--core-services/08-sysctl.sh2
-rw-r--r--functions4
-rwxr-xr-xservices/agetty-generic/run4
5 files changed, 10 insertions, 10 deletions
diff --git a/core-services/02-udev.sh b/core-services/02-udev.sh
index 56fa703..b08f8ca 100644
--- a/core-services/02-udev.sh
+++ b/core-services/02-udev.sh
@@ -4,8 +4,8 @@
 
 if [ -x /usr/lib/systemd/systemd-udevd ]; then
     _udevd=/usr/lib/systemd/systemd-udevd
-elif [ -x /usr/sbin/udevd ]; then
-    _udevd=/usr/sbin/udevd
+elif [ -x /sbin/udevd -o -x /bin/udevd ]; then
+    _udevd=udevd
 else
     msg_warn "cannot find udevd!"
 fi
diff --git a/core-services/03-filesystems.sh b/core-services/03-filesystems.sh
index 01c4fe4..c07dfd1 100644
--- a/core-services/03-filesystems.sh
+++ b/core-services/03-filesystems.sh
@@ -5,7 +5,7 @@
 msg "Remounting rootfs read-only..."
 mount -o remount,ro / || emergency_shell
 
-if [ -x /sbin/dmraid ]; then
+if [ -x /sbin/dmraid -o -x /bin/dmraid ]; then
     msg "Activating dmraid devices..."
     dmraid -i -ay
 fi
@@ -15,7 +15,7 @@ if [ -x /bin/btrfs ]; then
     btrfs device scan || emergency_shell
 fi
 
-if [ -x /sbin/vgchange ]; then
+if [ -x /sbin/vgchange -o -x /bin/vgchange ]; then
     msg "Activating LVM devices..."
     vgchange --sysinit -a y || emergency_shell
 fi
@@ -24,7 +24,7 @@ if [ -e /etc/crypttab ]; then
     msg "Activating encrypted devices..."
     awk -f /etc/runit/crypt.awk /etc/crypttab
 
-    if [ -x /sbin/vgchange ]; then
+    if [ -x /sbin/vgchange -o -x /bin/vgchange ]; then
         msg "Activating LVM devices for dm-crypt..."
         vgchange --sysinit -a y || emergency_shell
     fi
diff --git a/core-services/08-sysctl.sh b/core-services/08-sysctl.sh
index 2f393ee..44aa4ad 100644
--- a/core-services/08-sysctl.sh
+++ b/core-services/08-sysctl.sh
@@ -1,6 +1,6 @@
 # vim: set ts=4 sw=4 et:
 
-if [ -x /sbin/sysctl ]; then
+if [ -x /sbin/sysctl -o -x /bin/sysctl ]; then
     msg "Loading sysctl(8) settings..."
     sysctl --system
 fi
diff --git a/functions b/functions
index 971d288..d1cd318 100644
--- a/functions
+++ b/functions
@@ -37,7 +37,7 @@ detect_virt() {
 
 deactivate_vgs() {
    _group=${1:-All}
-   if [ -x /sbin/vgchange ]; then
+   if [ -x /sbin/vgchange -o -x /bin/vgchange ]; then
        vgs=$(vgs|wc -l)
        if [ $vgs -gt 0 ]; then
            msg "Deactivating $_group LVM Volume Groups..."
@@ -47,7 +47,7 @@ deactivate_vgs() {
 }
 
 deactivate_crypt() {
-   if [ -x /sbin/dmsetup ]; then
+   if [ -x /sbin/dmsetup -o -x /bin/dmsetup ]; then
        msg "Deactivating Crypt Volumes"
        dmsetup ls --target crypt --exec 'cryptsetup close'
        deactivate_vgs "Crypt"
diff --git a/services/agetty-generic/run b/services/agetty-generic/run
index 1e6c2bd..af36daa 100755
--- a/services/agetty-generic/run
+++ b/services/agetty-generic/run
@@ -4,10 +4,10 @@ tty=${PWD##*-}
 
 [ -r conf ] && . ./conf
 
-if [ -x /sbin/getty ]; then
+if [ -x /sbin/getty -o -x /bin/getty ]; then
 	# busybox
 	GETTY=getty
-elif [ -x /sbin/agetty ]; then
+elif [ -x /sbin/agetty -o -x /bin/agetty ]; then
 	# util-linux
 	GETTY=agetty
 fi