[paketler-commits] r28042 - in 2007/system/base/mkinitramfs: . files

[paketler-commits at pardus.org.tr]

Author: cartman
Date: Fri Jun 22 14:15:57 2007
New Revision: 28042

Modified:
   2007/system/base/mkinitramfs/files/init
   2007/system/base/mkinitramfs/files/mkinitramfs
   2007/system/base/mkinitramfs/pspec.xml
Log:
Use mdadm dynamically, merge

Modified: 2007/system/base/mkinitramfs/files/init
=================================================================
--- 2007/system/base/mkinitramfs/files/init	(original)
+++ 2007/system/base/mkinitramfs/files/init	Fri Jun 22 14:15:57 2007
@@ -14,9 +14,10 @@
 QUIET=0
 RAID=0
 ROOT_DEVICE=""
+RESUME_DEVICE=""
 IMG_DEVICES="hd[a-z] sr[0-9]* scd[a-z]"
 MNTDIR=""
-RESUME_DEVICE=""
+
 
 fall2sh() {
     echo "--> $*"
@@ -33,6 +34,7 @@
     /bin/modprobe raid1
     /bin/modprobe raid10
     /bin/modprobe raid456
+    /bin/mdadm --examine --scan > /etc/mdadm.conf
     /bin/mdadm -As
 }
 

Modified: 2007/system/base/mkinitramfs/files/mkinitramfs
=================================================================
--- 2007/system/base/mkinitramfs/files/mkinitramfs	(original)
+++ 2007/system/base/mkinitramfs/files/mkinitramfs	Fri Jun 22 14:15:57 2007
@@ -357,7 +357,7 @@
 
 if [ "$ADD_NET_MODULES" == "1" ]; then
     PRE_NET="af_packet mii 8390"
-    NET_MODULES="via-rhine 8139too ne2k-pci e100 sky2"
+    NET_MODULES="via-rhine 8139too ne2k-pci e100 sky2 tg3 skge"
 else
     PRE_NET=""
     NET_MODULES=""
@@ -452,7 +452,6 @@
 
 if [ -f "/sbin/mdadm.static" ]; then
     cp -a /sbin/mdadm.static $MOUNT_IMAGE/bin/mdadm
-    cp -a /etc/mdadm.conf $MOUNT_IMAGE/etc/mdadm.conf
 fi
 
 # install init script

Modified: 2007/system/base/mkinitramfs/pspec.xml
=================================================================
--- 2007/system/base/mkinitramfs/pspec.xml	(original)
+++ 2007/system/base/mkinitramfs/pspec.xml	Fri Jun 22 14:15:57 2007
@@ -42,6 +42,13 @@
     </Package>
 
     <History>
+        <Update release="31">
+            <Date>2007-06-21</Date>
+            <Version>0.3</Version>
+            <Comment>Use mdadm dynamically</Comment>
+            <Name>Onur Küçük</Name>
+            <Email>onur at pardus.org.tr</Email>
+        </Update>
         <Update release="30">
             <Date>2007-06-21</Date>
             <Version>0.3</Version>