let the kernel installed to satisfy dependencies and try cleaning up after creating...

diff --git a/build.common b/build.common
index 7430246..4da73e1 100644 (file)
--- a/build.common
+++ b/build.common
@@ -74,9 +74,9 @@ function pl_getKexcludes () {
     distroname=$1; shift
     case $distroname in
        f*)
-           echo 'kernel kernel-PAE kernel-debug kernel-PAEdebug kernel-vserver kernel-devel kernel-headers kernel-debuginfo util-vserver* iptables iptables-ipv6 iproute drupal' ;;
+           echo 'kernel-PAE kernel-debug kernel-PAEdebug kernel-vserver kernel-devel kernel-headers kernel-debuginfo util-vserver* iptables iptables-ipv6 iproute drupal' ;;
        centos5)
-           echo 'kernel kernel-vserver kernel-devel kernel-headers kernel-debuginfo util-vserver* iptables iproute drupal inotify-tools* libnl' ;;
+           echo 'kernel-vserver kernel-devel kernel-headers kernel-debuginfo util-vserver* iptables iproute drupal inotify-tools* libnl' ;;
        *)
            echo "pl_DISTRO_NAME=$pl_DISTRO_NAME not supported in getexcludes.sh" ; exit 1 ;;
     esac
@@ -429,6 +429,15 @@ fi
     # Clean up
     mkfedora_cleanup
 
+    # link to our version of kernel/initrd
+    pushd $vroot/boot/
+    rm -rf kernel-boot kernel-bootsmp initrd-boot initrd-bootsmp
+    ln -s vmlinuz-*${pldistro}* kernel-boot
+    ln -s vmlinuz-*${pldistro}* kernel-bootsmp
+    ln -s initrd-*${pldistro}* initrd-boot
+    ln -s initrd-*${pldistro}* initrd-bootsmp
+    popd
+
     return 0
 }
 

diff --git a/config.planetlab/bootcd.pkgs b/config.planetlab/bootcd.pkgs
index 73af53a..f55bb78 100644 (file)
--- a/config.planetlab/bootcd.pkgs
+++ b/config.planetlab/bootcd.pkgs
@@ -69,6 +69,7 @@ junk: usr/lib/locale
 junk: usr/lib/sasl*
 junk: usr/lib/gconv
 junk: usr/lib/tls
+junk: usr/boot
 #
 precious: usr/share/i18n/locales/en_US
 precious: usr/share/i18n/charmaps/UTF-8.gz
@@ -77,4 +78,9 @@ precious: usr/share/terminfo/l/linux
 precious: usr/share/terminfo/v/vt100
 precious: usr/share/terminfo/x/xterm
 precious: usr/share/zoneinfo/UTC
+precious: boot/*@pldistro@*
+precious: boot/config*
+precious: boot/initrd-boot*
+precious: boot/kernel-boot*
+precious: boot/grub
 precious<=f8 precious<=centos5: usr/lib/locale/en_US.utf8

diff --git a/config.planetlab/bootstrapfs.pkgs b/config.planetlab/bootstrapfs.pkgs
index 98e53b6..51fa9a5 100644 (file)
--- a/config.planetlab/bootstrapfs.pkgs
+++ b/config.planetlab/bootstrapfs.pkgs
@@ -121,3 +121,12 @@ package: vsys-scripts
 package: monitor-client
 package: monitor-runlevelagent
 package: pyplnet
+
+#################### formerly in prep.sh
+junk: usr/boot
+#
+precious: boot/*@pldistro@*
+precious: boot/config*
+precious: boot/initrd-boot*
+precious: boot/kernel-boot*
+precious: boot/grub