~xnox/debian-cd/unexpected-modules-names

« back to all changes in this revision

Viewing changes to tools/boot/bionic/boot-amd64

  • Committer: Steve Langasek
  • Date: 2019-03-08 16:59:14 UTC
  • Revision ID: steve.langasek@canonical.com-20190308165914-5cj8q8jznysqt364
Prune dead code: we never produce artifacts called vmlinuz*.efi.signed with recent versions of livecd-rootfs, just expect our input filename to be sensible

Show diffs side-by-side

added added

removed removed

Lines of Context:
152
152
    done
153
153
    fi
154
154
    if [ "$CDIMAGE_LIVE" = 1 ]; then
155
 
        if [ -e "$CDDIR/casper/filesystem.kernel-$FLAVOUR.efi.signed" ]; then
156
 
            mv $CDDIR/casper/filesystem.kernel-$FLAVOUR.efi.signed $CDDIR/casper/vmlinuz.efi
157
 
            rm -f $CDDIR/casper/filesystem.kernel-$FLAVOUR
158
 
            if [ -e "$CDDIR/casper/filesystem.kernel-${FLAVOUR}-hwe.efi.signed" ]; then
159
 
                mv $CDDIR/casper/filesystem.kernel-${FLAVOUR}-hwe.efi.signed $CDDIR/casper/hwe-vmlinuz.efi
160
 
                rm -f $CDDIR/casper/filesystem.kernel-${FLAVOUR}-hwe
161
 
            fi
162
 
            CASPER_KERNEL=/casper/vmlinuz.efi
163
 
        else
164
 
            mv $CDDIR/casper/filesystem.kernel-$FLAVOUR $CDDIR/casper/vmlinuz
165
 
            if [ -e "$CDDIR/casper/filesystem.kernel-${FLAVOUR}-hwe" ]; then
166
 
                mv $CDDIR/casper/filesystem.kernel-${FLAVOUR}-hwe $CDDIR/casper/hwe-vmlinuz
167
 
            fi
168
 
            CASPER_KERNEL=/casper/vmlinuz
 
155
        mv $CDDIR/casper/filesystem.kernel-$FLAVOUR $CDDIR/casper/vmlinuz
 
156
        if [ -e "$CDDIR/casper/filesystem.kernel-${FLAVOUR}-hwe" ]; then
 
157
            mv $CDDIR/casper/filesystem.kernel-${FLAVOUR}-hwe $CDDIR/casper/hwe-vmlinuz
169
158
        fi
 
159
        CASPER_KERNEL=/casper/vmlinuz
170
160
        CASPER_INITRD="/casper/initrd$(initrd_suffix "$CDDIR/casper/filesystem.initrd-$FLAVOUR")"
171
161
        mv $CDDIR/casper/filesystem.initrd-$FLAVOUR "$CDDIR$CASPER_INITRD"
172
162
        if [ -e "$CDDIR/casper/filesystem.initrd-${FLAVOUR}-hwe" ]; then