Don't preinstall dkms

  - significantly reduces installed system size when not using
    proprietary drivers, reduces ISO size to a lesser extent
  - relatively minor increase in boot time when using proprietary
    drivers

1 files changed, 25 insertions, 3 deletions

diff --git a/files/mga_rpms/update_media.sh b/files/mga_rpms/update_media.sh
index 3fe9670..826a32e 100755
--- a/files/mga_rpms/update_media.sh
+++ b/files/mga_rpms/update_media.sh
@@ -5,9 +5,18 @@ copy_latest()
 {
   repo=$1
   for arch in i586 x86_64 ; do
-    path=`ls -1v $bcdmedia/$arch/media/$repo/{release,updates}/$2.rpm 2> /dev/null | tail -1`
+    if [ $2 = "lib" ] ; then
+      if [ $arch = "x86_64" ] ; then
+        name=lib64$3
+      else
+        name=lib$3
+      fi
+    else
+      name=$2
+    fi
+    path=`ls -1v $bcdmedia/$arch/media/$repo/{release,updates}/$name.rpm 2> /dev/null | tail -1`
     if [ -z $path ] ; then
-      echo "Couldn't find $2 for $arch"
+      echo "Couldn't find $name for $arch"
       exit 1
     else
       cp $path $arch/mga_rpms/$repo/
@@ -27,10 +36,23 @@ copy_latest core grub2-2.*
 copy_latest core grub2-efi-2.*
 copy_latest core grub2-mageia-theme-2.*
 copy_latest core os-prober-*
-copy_latest core lib*efivar0-*
+copy_latest core lib efivar0-*
 copy_latest core efibootmgr-*
 copy_latest core efivar-*
 
+# add dkms
+copy_latest core dkms-2*
+copy_latest core gcc-4*
+copy_latest core gcc-cpp-4*
+copy_latest core glibc-devel*
+copy_latest core kernel-desktop*-devel-4*
+copy_latest core kernel-desktop*-devel-latest-4*
+copy_latest core kernel-userspace-headers-*
+copy_latest core lib mpc3-1*
+copy_latest core lib ncurses-devel*
+copy_latest core libstdc++-devel*
+copy_latest core make-4*
+
 # add fglrx
 copy_latest nonfree dkms-fglrx-*
 copy_latest nonfree x11-driver-video-fglrx-*