From 6153b5225e261f159f2c084e787477932175ebf9 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 14 Aug 2014 12:59:10 +0200 Subject: [PATCH] mdadm isn't an add-on any more --- config/rootfiles/common/armv5tel/initscripts | 1 - config/rootfiles/common/i586/initscripts | 1 - config/rootfiles/common/mdadm | 4 ---- lfs/mdadm | 7 ------- 4 files changed, 13 deletions(-) diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts index 5d5c692049..5321a6bce2 100644 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -43,7 +43,6 @@ etc/rc.d/init.d/ipsec etc/rc.d/init.d/leds etc/rc.d/init.d/localnet etc/rc.d/init.d/mISDN -#etc/rc.d/init.d/mdadm #etc/rc.d/init.d/mediatomb #etc/rc.d/init.d/messagebus #etc/rc.d/init.d/miau diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index fa3dbcdb8c..7fab7dd4c3 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -45,7 +45,6 @@ etc/rc.d/init.d/ipsec etc/rc.d/init.d/leds etc/rc.d/init.d/localnet etc/rc.d/init.d/mISDN -#etc/rc.d/init.d/mdadm #etc/rc.d/init.d/mediatomb #etc/rc.d/init.d/messagebus #etc/rc.d/init.d/miau diff --git a/config/rootfiles/common/mdadm b/config/rootfiles/common/mdadm index d2d87267d8..00d38a8c86 100644 --- a/config/rootfiles/common/mdadm +++ b/config/rootfiles/common/mdadm @@ -1,6 +1,3 @@ -etc/rc.d/rc0.d/S85mdadm -etc/rc.d/rc6.d/S75mdadm -etc/rc.d/rcsysinit.d/S11mdadm lib/udev/rules.d/63-md-raid-arrays.rules lib/udev/rules.d/64-md-raid-assembly.rules sbin/mdadm @@ -9,5 +6,4 @@ sbin/mdmon #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 srv/web/ipfire/cgi-bin/mdstat.cgi diff --git a/lfs/mdadm b/lfs/mdadm index 46dbf2c2f3..2970b004c7 100644 --- a/lfs/mdadm +++ b/lfs/mdadm @@ -31,10 +31,6 @@ DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -PROG = mdadm -PAK_VER = 2 - -DEPS = "" ############################################################################### # Top-level Rules @@ -80,8 +76,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/mdadm-3.3.1-Assemble-Only-fail-auto-assemble-in-face-of-mdadm.co.patch 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) -- 2.39.5