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 da4238bdea2399aa7803a29f146a3e596853f281..b98ec3cd58ebba068ff9adc5be173ad27e1e775c 100644 (file)
--- 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
 lib/udev/rules.d/64-md-raid.rules
 sbin/mdadm
 sbin/mdmon

diff --git a/lfs/mdadm b/lfs/mdadm
index 7d898bbc2c2afd8409ff23d3de7429569b7f7d1f..5c4024700fccf823db6e3c8465982b43f06139c6 100644 (file)
--- a/lfs/mdadm
+++ b/lfs/mdadm
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
 ###############################################################################
 #                                                                             #
 # 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        #
 #                                                                             #
 # 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
 
 
 include Config
 

-VER        = 3.1.1
+VER        = 3.2.1

 
 THISAPP    = mdadm-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 
 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
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mdadm

-PAK_VER    = 1
+PAK_VER    = 2

 
 DEPS       = ""
 
 
 DEPS       = ""
 


@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 

-$(DL_FILE)_MD5 = 4fd8e375a2ee314becd3196c1a250d98
+$(DL_FILE)_MD5 = d1e2549202bd79d9e99f1498d1109530

 
 install : $(TARGET)
 
 
 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
        @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)
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/src/initscripts/init.d/mdadm b/src/initscripts/init.d/mdadm
index 4b79ca8490d328b149a20242ba77e990cfff0e8d..03f6fe458f8d0f4fdfa09eda7cf18eed050d13c5 100644 (file)
--- a/src/initscripts/init.d/mdadm
+++ b/src/initscripts/init.d/mdadm
@@ -1,6 +1,6 @@
 #!/bin/sh
 ########################################################################
 #!/bin/sh
 ########################################################################

-# Begin $rc_base/init.d/mdadmraid
+# Begin $rc_base/init.d/mdadm

 #
 # Description : This script controls software Raid
 #
 #
 # Description : This script controls software Raid
 #


@@ -17,28 +17,15 @@
 
 case "${1}" in
    start)
 
 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
                ;;
 
    stop)
                boot_mesg "Stopping Raid devices..."
                mdadm --stop --scan

+               echo_ok

                ;;
 
    restart)
                ;;
 
    restart)


@@ -57,4 +44,4 @@ case "${1}" in
                ;;
 esac
 
                ;;
 esac
 

-# End $rc_base/init.d/mdadmraid
\ No newline at end of file
+# End $rc_base/init.d/mdadm