Browse Source

dmraid: fix init script

Init scripts are only run if they are prefixed with S??, and dmraid gets
installed into /usr/sbin, not /sbin.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Peter Korsgaard 15 years ago
parent
commit
78e7c0b642
2 changed files with 5 additions and 5 deletions
  1. 3 3
      package/dmraid/dmraid.init
  2. 2 2
      package/dmraid/dmraid.mk

+ 3 - 3
package/dmraid/dmraid.init

@@ -2,7 +2,7 @@
 
 set -e
 
-[ -x /sbin/dmraid ] || exit 0
+[ -x /usr/sbin/dmraid ] || exit 0
 
 # try to load module in case that hasn't been done yet
 modprobe dm-mod >/dev/null 2>&1
@@ -10,12 +10,12 @@ modprobe dm-mod >/dev/null 2>&1
 case "$1" in
 	start|"")
 		echo "Setting up DMRAID devices..."
-		/sbin/dmraid --activate yes --ignorelocking --verbose
+		/usr/sbin/dmraid --activate yes --ignorelocking --verbose
 		;;
 
 	stop)
 		echo "Shutting down DMRAID devices... "
-		/sbin/dmraid --activate no --ignorelocking --verbose
+		/usr/sbin/dmraid --activate no --ignorelocking --verbose
 		;;
 
 	restart|force-reload)

+ 2 - 2
package/dmraid/dmraid.mk

@@ -14,11 +14,11 @@ DMRAID_INSTALL_STAGING:=yes
 
 define DMRAID_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 0755 $(@D)/$(DMRAID_SUBDIR)/tools/dmraid $(TARGET_DIR)/usr/sbin
-	$(INSTALL) -m 0755 package/dmraid/dmraid.init $(TARGET_DIR)/etc/init.d/dmraid
+	$(INSTALL) -m 0755 package/dmraid/dmraid.init $(TARGET_DIR)/etc/init.d/S20dmraid
 endef
 
 define DMRAID_UNINSTALL_TARGET_CMDS
-	rm -f $(TARGET_DIR)/usr/sbin/dmraid $(TARGET_DIR)/etc/init.d/dmraid
+	rm -f $(TARGET_DIR)/usr/sbin/dmraid $(TARGET_DIR)/etc/init.d/S20dmraid
 endef
 
 $(eval $(call AUTOTARGETS,package,dmraid))