Changeset 310

Timestamp:

Mar 13, 2007 5:04:35 PM (6 years ago)

Author:

dkg

Message:

debirf: moved kernel installation to its own plugin.

Location:

trunk/debirf

Files:

• make-debirf (modified) (3 diffs)
• plugins/install-kernel (added)

trunk/debirf/make-debirf

@@ -9 +9 @@
 source "$CMD_PATH/debirf.conf"
 
-DEBIRF_KERNEL_PACKAGE="$1"
+if [ "$1" ]; then
+    DEBIRF_KERNEL_PACKAGE="$1"
+fi
 
 cd "$DEBIRF_PATH"
@@ -56 +58 @@
     
     > .stage/1
-}
-
-install_kernel_dpkg() {
-    local KNAME=$(basename "$1")
-    cp "$1" "$DEBIRF_ROOT/root/$KNAME"
-    chroot "$DEBIRF_ROOT" dpkg --install "root/$KNAME"
-    # and clean up, just in case there were missing dependencies.
-    chroot "$DEBIRF_ROOT" apt-get -f install
-    rm "$DEBIRF_ROOT/root/$KNAME"
-}
-
-install_kernel() {
-    # kernel install settings
-    cat >"$DEBIRF_ROOT/etc/kernel-img.conf" <<EOF
-# debirf: default kernel-img options:
-do_symlinks = yes
-do_bootloader = no
-do_initrd = yes
-EOF
-    
-    local CANDNAME=$(dpkg -I "$1" | grep '^ Package:' | awk '{ print $2 }' )
-    local CANDVERS=$(dpkg -I "$1" | grep '^ Package:' | awk '{ print $3 }' )
-    
-    install_kernel_dpkg "$1"
-    
-    # extract kernel, debian stock initrd, and remove them from the fs:
-    mkdir -p extras/boot
-    local KERNEL="$DEBIRF_ROOT/boot/vmlinu"*"$CANDNAME"
-    local INITRD="$DEBIRF_ROOT/boot/initrd"*"$CANDNAME"
-    [ -f "$KERNEL" ] && mv "$KERNEL" extras/boot/$(basename "$KERNEL")
-    [ -f "$INITRD" ] && mv "$INITRD" extras/boot/$(basename "$INITRD")
-    
-    > .stage/2
 }
 
@@ -163 +132 @@
 install_plugins
 
-##### install kernel
-if [ -r "$DEBIRF_KERNEL_PACKAGE" ] ; then
-    read -p "install kernel ${DEBIRF_KERNEL_PACKAGE}? [Y|n]: " -n 1 OK ; [ -z $OK ] || echo
-else 
-    msg "WARNING: could not find the kernel package '${DEBIRF_KERNEL_PACKAGE}'"
-fi
-if [ -z "$OK" -o "${OK/y/Y}" = 'Y' ] ; then
-    msg "installing kernel..."
-    install_kernel "$DEBIRF_KERNEL_PACKAGE"
-else
-    msg "WARNING: things will not work properly without the proper kernel modules installed unless you've built a non-modular kernel."
-fi
-
 ##### prune
 msg "pruning..."