update to 31b795ca71189b326b80666076398f31aea4f2be

[automated-distro-installer] / fai / config / scripts / CENTOS / 30-mkinitrd

diff --git a/fai/config/scripts/CENTOS/30-mkinitrd b/fai/config/scripts/CENTOS/30-mkinitrd
index cd114f9c179d6d9a5e9ef5c6d2a4d4b83fa98e2e..f7564d4187b744d3a9d7609635fe055c7e2a3abc 100755 (executable)
--- a/fai/config/scripts/CENTOS/30-mkinitrd
+++ b/fai/config/scripts/CENTOS/30-mkinitrd
@@ -8,57 +8,18 @@ error=0; trap 'error=$(($?>$error?$?:$error))' ERR # save maximum error code
 ainsl -v /etc/fstab "proc      /proc   proc    defaults        0 0"
 ainsl -v /etc/fstab "sysfs     /sys    sysfs   auto            0 0"
 
-version=`$ROOTCMD rpm -qv kernel | cut -d- -f2-`
+version=$($ROOTCMD rpm -qv kernel | cut -d- -f2-)
 
-use_mkinitrd() {
-
-    # CentOS 5 uses mkinitrd
-    $ROOTCMD kudzu -q -k $version
-    # Unfortunately mkinitrd is horrible at guessing which modules to include,
-    # especially when the running kernel is different than the kernel for which
-    # we are creating an initrd...
-
-    drivers=""
-    for bus in pci virtio; do
-       for dr in `$ROOTCMD kudzu -p -k $version -b $bus|grep driver:|cut -d' ' -f2|sort -u`; do
-           found=`find $target/lib/modules/$version/ -name $dr.ko 2>/dev/null`
-           if [ -n "$found" ]; then
-               # add driver only if it's available as .ko module in the destination kernel
-               drivers+=" --with=$dr"
-           fi
-       done
-    done
-
-    $ROOTCMD mkinitrd -f -v $drivers /boot/initrd-$version.img $version
-
-    if [ $? -eq 1 ]; then
-       echo "WARNING: generating initrd with list of drivers failed. Trying without."
-       $ROOTCMD mkinitrd -f -v /boot/initrd-$version.img $version
-    fi
-}
-
-# CentOS 5 uses mkinitrd
-if [ -f $target/sbin/mkinitrd ]; then
-    use_mkinitrd
-fi
 
 if [ -f $target/etc/lvm/lvm.conf ]; then
      sed -i -e 's/use_lvmetad = 1/use_lvmetad = 0/' $target/etc/lvm/lvm.conf
      ainsl -av /etc/dracut.conf.d/fai.conf 'add_dracutmodules+=" lvm "'
 fi
 
-# call dracut for CentOS 7
-if [ -f $target/usr/sbin/dracut ]; then
-    # add filesystem driver into initrd
-    ainsl -av /etc/dracut.conf.d/fai.conf 'filesystems+="ext4"'
-    $ROOTCMD dracut -v --kver $version --force
-fi
 
-# call dracut for CentOS 6
-if [ -f $target/sbin/dracut ]; then
-    # add filesystem driver into initrd
-    ainsl -av /etc/dracut.conf.d/fai.conf 'filesystems+="ext4"'
-    $ROOTCMD dracut -v $version
-fi
+# add filesystem driver into initrd
+ainsl -av /etc/dracut.conf.d/fai.conf 'filesystems+="ext4"'
+$ROOTCMD dracut -v --kver $version --force
+
 
 exit $error