From: root <root@ikarus.homeip.net>
Date: Fri, 5 Feb 2010 12:24:43 +0000 (+0100)
Subject: Added mdadm packages.
X-Git-Tag: v2.9-beta1~475
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=aff78c9698833dd020f732339206935df5c3e3b8

Added mdadm packages.
---

diff --git a/config/rootfiles/common/initscripts b/config/rootfiles/common/initscripts
index 3e2e8f5e98..1ea3c7a574 100644
--- a/config/rootfiles/common/initscripts
+++ b/config/rootfiles/common/initscripts
@@ -195,3 +195,4 @@ etc/rc.d/rc6.d/K85tmpfs
 #etc/rc.d/rc3.d/S99miau
 #etc/rc.d/rc6.d/K01miau
 #etc/rc.d/init.d/netsnmpd
+etc/rc.d/init.d/mdadm
\ No newline at end of file
diff --git a/config/rootfiles/packages/mdadm b/config/rootfiles/packages/mdadm
new file mode 100644
index 0000000000..680a3f19dd
--- /dev/null
+++ b/config/rootfiles/packages/mdadm
@@ -0,0 +1,9 @@
+lib/udev/rules.d
+lib/udev/rules.d/64-md-raid.rules
+sbin/mdadm
+sbin/mdmon
+#usr/share/man/man4/md.4
+#usr/share/man/man5/mdadm.conf.5
+#usr/share/man/man8/mdadm.8
+#usr/share/man/man8/mdmon.8
+etc/rc.d/init.d/mdadm
\ No newline at end of file
diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 75460687ee..03a2a6a5bf 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -75,7 +75,7 @@
 * compat-wireless-2.6.32.2-kmod-2.6.27.42-ipfire-xen
 * coreutils-5.96
 * cpio-2.6
-* cpufrequtils-005
+* cpufrequtils-007
 * cups-1.4.2
 * curl-7.19.5
 * cyrus-imapd-2.2.12
@@ -135,7 +135,7 @@
 * gzip-1.3.5
 * hddtemp-0.3-beta14
 * hdparm-8.9
-* hostapd-0.6.9
+* hostapd-0.7.1
 * hplip-2.7.10
 * hso-1.9-kmod-2.6.27.42-ipfire
 * hso-1.9-kmod-2.6.27.42-ipfire-xen
@@ -200,7 +200,7 @@
 * linux-2.6.27.42-ipfire-xen
 * linux-atm-2.4.1
 * linux-libc-headers-2.6.12.0
-* lm_sensors-3.0.3
+* lm_sensors-3.1.2
 * logrotate-3.7.1
 * logwatch-7.3.6
 * lsof-4.78
@@ -210,13 +210,14 @@
 * mISDN_20090906-kmod-2.6.27.42-ipfire
 * mISDN_20090906-kmod-2.6.27.42-ipfire-xen
 * mISDNuser_20090906
-* madwifi-hal-0.10.5.6-r4031-20090529-kmod-2.6.27.42-ipfire
-* madwifi-hal-0.10.5.6-r4031-20090529-kmod-2.6.27.42-ipfire-xen
+* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.27.42-ipfire
+* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.27.42-ipfire-xen
 * make-3.81
 * man-db-2.4.3
 * man-pages-2.34
 * mbr-1.1.8
 * mc-4.7.0
+* mdadm-3.1.1
 * mechanize-0.1.8
 * mediatomb-svn2020
 * memtest86+-4.00
@@ -280,7 +281,7 @@
 * pptp-1.7.2
 * procps-3.2.6
 * psmisc-22.2
-* qemu-0.11.0
+* qemu-0.12.2
 * r8101-kmod-2.6.27.42-ipfire
 * r8101-kmod-2.6.27.42-ipfire-xen
 * r8168-8.014.00-kmod-2.6.27.42-ipfire
diff --git a/make.sh b/make.sh
index 9e7293a6a0..99ab98671f 100755
--- a/make.sh
+++ b/make.sh
@@ -643,6 +643,7 @@ buildipfire() {
   ipfiremake lcr
   ipfiremake usb_modeswitch
   ipfiremake zerofree
+  ipfiremake mdadm
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
diff --git a/src/initscripts/init.d/mdadm b/src/initscripts/init.d/mdadm
new file mode 100644
index 0000000000..4b79ca8490
--- /dev/null
+++ b/src/initscripts/init.d/mdadm
@@ -0,0 +1,60 @@
+#!/bin/sh
+########################################################################
+# Begin $rc_base/init.d/mdadmraid
+#
+# Description : This script controls software Raid
+#
+# Authors     : Dirk Hoefle  <dhoefle@gmx.net>
+#
+# Version     : 01.00
+#
+# Notes       :
+#
+########################################################################
+
+. /etc/sysconfig/rc
+. ${rc_functions}
+
+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 
+		;;
+
+   stop)
+		boot_mesg "Stopping Raid devices..."
+		mdadm --stop --scan
+		;;
+
+   restart)
+		${0} stop
+		sleep 1
+		${0} start
+		;;
+
+   status)
+		cat /proc/mdstat
+		;;
+
+   *)
+		echo "Usage: ${0} {start|stop|restart|status}"
+		exit 1
+		;;
+esac
+
+# End $rc_base/init.d/mdadmraid
\ No newline at end of file