summary refs log tree commit diff
path: root/core-services
diff options
context:
space:
mode:
authorJuan RP <xtraeme@voidlinux.eu>2015-06-02 08:42:40 +0200
committerJuan RP <xtraeme@voidlinux.eu>2015-06-02 08:42:40 +0200
commit341f0470cfcae91e180e0c7ddf0101ca2c92253c (patch)
tree83c4ad79b879336f53a354244d905d8f0452f7bc /core-services
parent4bb1c55f3390bbcb0e11b4ab44299ae06d89b888 (diff)
downloadrunit-void-341f0470cfcae91e180e0c7ddf0101ca2c92253c.tar.gz
runit-void-341f0470cfcae91e180e0c7ddf0101ca2c92253c.tar.xz
runit-void-341f0470cfcae91e180e0c7ddf0101ca2c92253c.zip
Update paths for the usr/sbin -> usr/bin move.
Diffstat (limited to 'core-services')
-rw-r--r--core-services/02-udev.sh4
-rw-r--r--core-services/03-filesystems.sh6
-rw-r--r--core-services/08-sysctl.sh2
3 files changed, 6 insertions, 6 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