webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

mdadm: update to 3.2.1.

Browse Source 
changed initskript to scan also for raid devices if no config is present.
This commit is contained in:
Arne Fitzenreiter
2011-04-21 11:03:43 +02:00
parent 8ace0e749b
commit d366bd9f33
3 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/rootfiles/packages/mdadm
View File

@@ -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

11
lfs/mdadm
View File

@@ -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)

25
src/initscripts/init.d/mdadm
View File

@@ -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
# End $rc_base/init.d/mdadm