Changeset 323

Timestamp:

Mar 13, 2007 7:45:38 PM (6 years ago)

Author:

jrollins

Message:

debirf: fixed removal of stock kernel, initrd image.

Location:

trunk/debirf

Files:

• make-debirf (modified) (2 diffs)
• plugins/install/install-kernel (modified) (1 diff)

trunk/debirf/make-debirf

@@ -11 +11 @@
 if [ "$1" ]; then
     DEBIRF_KERNEL_PACKAGE="$1"
+    KERNEL="vmlinu*"$(dpkg -I "$DEBIRF_KERNEL_PACKAGE" | grep 'Package:' | awk '{ print $2 }' | sed -s s/'linux-image-'//)
 fi
 
 cd "$DEBIRF_PATH"
 
-# maybe fix locales?
+# set locale default
 export LC_CTYPE="C"
 export LANGUAGE="C"
@@ -21 +22 @@
 
 msg() {
-    echo "  debirf: $@"
+    echo " debirf: $@"
 }
 

trunk/debirf/plugins/install/install-kernel

@@ -22 +22 @@
 EOF
     
-    local CANDNAME=$(dpkg -I "$1" | grep '^ Package:' | awk '{ print $2 }' )
-    local CANDVERS=$(echo "$CANDNAME" | sed -s s/'linux-image-'// )
-    
     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"*"$CANDVERS"
-    local INITRD="$DEBIRF_ROOT/boot/initrd"*"$CANDVERS"
-    [ -f "$KERNEL" ] && mv "$KERNEL" extras/boot/$(basename "$KERNEL")
-    [ -f "$INITRD" ] && mv "$INITRD" extras/boot/$(basename "$INITRD")
+    mv "$DEBIRF_ROOT"/boot/vmlinu* extras/boot/
+    mv "$DEBIRF_ROOT"/boot/initrd* extras/boot/
 }