From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 21 Apr 2011 09:03:43 +0000 (+0200)
Subject: mdadm: update to 3.2.1.
X-Git-Tag: v2.9-core49~25
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=d366bd9f33d2c79e0dab376bede95636cfcc2695

mdadm: update to 3.2.1.
changed initskript to scan also for raid devices if no config is present.
---

diff --git a/config/rootfiles/packages/mdadm b/config/rootfiles/packages/mdadm
index da4238bdea..b98ec3cd58 100644
--- a/config/rootfiles/packages/mdadm
+++ b/config/rootfiles/packages/mdadm
@@ -1,4 +1,6 @@
-lib/udev/rules.d
+etc/rc.d/rc0.d/S85mdadm
+etc/rc.d/rc6.d/S75mdadm
+etc/rc.d/rcsysinit.d/S15mdadm
 lib/udev/rules.d/64-md-raid.rules
 sbin/mdadm
 sbin/mdmon
diff --git a/lfs/mdadm b/lfs/mdadm
index 7d898bbc2c..5c4024700f 100644
--- a/lfs/mdadm
+++ b/lfs/mdadm
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.1.1
+VER        = 3.2.1
 
 THISAPP    = mdadm-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mdadm
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 4fd8e375a2ee314becd3196c1a250d98
+$(DL_FILE)_MD5 = d1e2549202bd79d9e99f1498d1109530
 
 install : $(TARGET)
 
@@ -79,5 +79,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
+	ln -sf ../init.d/mdadm /etc/rc.d/rcsysinit.d/S11mdadm
+	ln -sf ../init.d/mdadm /etc/rc.d/rc0.d/S85mdadm
+	ln -sf ../init.d/mdadm /etc/rc.d/rc6.d/S75mdadm
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/src/initscripts/init.d/mdadm b/src/initscripts/init.d/mdadm
index 4b79ca8490..03f6fe458f 100644
--- a/src/initscripts/init.d/mdadm
+++ b/src/initscripts/init.d/mdadm
@@ -1,6 +1,6 @@
 #!/bin/sh
 ########################################################################
-# Begin $rc_base/init.d/mdadmraid
+# Begin $rc_base/init.d/mdadm
 #
 # Description : This script controls software Raid
 #
@@ -17,28 +17,15 @@
 
 case "${1}" in
    start)
-   
-		if [ -f /etc/mdadm.conf ]
-		then
-			boot_mesg "Starting Raid devices..."
-			
-			modprobe md
-			modprobe raid0
-			modprobe raid1
-			modprobe raid5
-			
-			sleep 1
-			
-			mdadm --assemble --scan
-		else
-			boot_mesg "Skipping raid devices, no config found..."
-			exit 1
-		fi 
+		boot_mesg "Scan/assemble mdadm raid devices..."
+		mdadm --assemble --scan
+		echo_ok
 		;;
 
    stop)
 		boot_mesg "Stopping Raid devices..."
 		mdadm --stop --scan
+		echo_ok
 		;;
 
    restart)
@@ -57,4 +44,4 @@ case "${1}" in
 		;;
 esac
 
-# End $rc_base/init.d/mdadmraid
\ No newline at end of file
+# End $rc_base/init.d/mdadm