From c90b88236cc50ff7206b0ecee2c0197a8cd6fa4e Mon Sep 17 00:00:00 2001
From: Lucas Manika Koeb <lmk08@c3sl.ufpr.br>
Date: Fri, 21 Jun 2013 11:01:03 -0300
Subject: [PATCH] 60-update-initrd: Always copy vmlinuz from $CHROOTDIR to
$CDDIR
The vmlinuz on $CHROOTDIR is updated when a new kernel is installed
through 30-upgrade, and need to be copied to $CDDIR/casper so the
live image boots correctly.
Signed-off-by: Lucas Manika Koeb <lmk08@c3sl.ufpr.br>
---
scripts/60-update-initrd_le5 | 6 ++----
scripts/60-update-initrd_minicom | 4 +---
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/scripts/60-update-initrd_le5 b/scripts/60-update-initrd_le5
index b003d3e..1983d04 100755
--- a/scripts/60-update-initrd_le5
+++ b/scripts/60-update-initrd_le5
@@ -113,10 +113,8 @@ cp -f "$TEMPLATES"/casper/10adduser ./scripts/casper-bottom/25adduser
find | cpio --quiet --dereference -o -H newc | lzma -7 \
> $CDDIR/casper/initrd.lz
-if [ -e "$TMP/NEW_KERNEL" ]; then
- cp -af $(sed 's/initrd.img/vmlinuz/g' <<< $INITRD) \
- "$CDDIR"/casper/vmlinuz
-fi
+cp -af $(sed 's/initrd.img/vmlinuz/g' <<< $INITRD) \
+ "$CDDIR"/casper/vmlinuz
cd "$PREFIX"
diff --git a/scripts/60-update-initrd_minicom b/scripts/60-update-initrd_minicom
index 26ca591..105b098 100755
--- a/scripts/60-update-initrd_minicom
+++ b/scripts/60-update-initrd_minicom
@@ -80,10 +80,8 @@ find | cpio --quiet --dereference -o -H newc | lzma -7 \
> $CDDIR/casper/initrd.lz
set -o pipefail
-if [ -e "$TMP/NEW_KERNEL" ]; then
- cp -af $(sed 's/initrd.img/vmlinuz/g' <<< $INITRD) \
+cp -af $(sed 's/initrd.img/vmlinuz/g' <<< $INITRD) \
"$CDDIR"/casper/vmlinuz
-fi
cd "$PREFIX"
--
GitLab