--- setup.orig	2009-02-02 19:02:57.000000000 -0200
+++ setup	2009-02-02 21:52:07.000000000 -0200
@@ -744,7 +744,7 @@
 
     # assemble a list of packages with groups, marking pre-selected ones
     # <package> <group> <selected>
-    local _pkgtmp="$($PACMAN -Sl core | awk '{print $2}')"
+    local _pkgtmp="$($PACMAN -Sl core | awk '!/kernel26/{print $2}')"
     local _pkglist=''
 
     $PACMAN -Si $_pkgtmp | \
@@ -797,6 +797,15 @@
         else
             echo -e "\nPackage Installation Complete." >>/tmp/pacman.log
         fi
+
+        $PACMAN -S kernel26 --noscriptlet 2>&1 >> /tmp/pacman.log ; \
+        echo $? > /tmp/.pacman-retcode ; \
+        if [ $(cat /tmp/.pacman-retcode) -ne 0 ]; then
+            echo -e "\nKernel Installation FAILED." >>/tmp/pacman.log
+        else
+            echo -e "\nKernel Installation Complete." >>/tmp/pacman.log
+        fi
+
         rm /tmp/setup-pacman-running
     ) &
 
@@ -1240,6 +1249,13 @@
 #
 run_mkinitcpio()
 {
+    # update modules dep and map files
+    # ALL_kver is defined under /etc/mkinitcpio.d/kernel26.kver
+    ( \
+        . /etc/mkinitcpio.d/kernel26.kver; \
+        depmod -b /mnt $ALL_kver;
+    )
+
     chroot_mount
     # all mkinitcpio output goes to /tmp/mkinitcpio.log, which we tail
     # into a dialog