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

« back to all changes in this revision

Viewing changes to tools/boot/disco/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:
151
151
    done
152
152
    fi
153
153
    if [ "$CDIMAGE_LIVE" = 1 ]; then
154
 
        if [ -e "$CDDIR/casper/filesystem.kernel-$FLAVOUR.efi.signed" ]; then
155
 
            mv $CDDIR/casper/filesystem.kernel-$FLAVOUR.efi.signed $CDDIR/casper/vmlinuz.efi
156
 
            rm -f $CDDIR/casper/filesystem.kernel-$FLAVOUR
157
 
            CASPER_KERNEL=/casper/vmlinuz.efi
158
 
        else
159
 
            mv $CDDIR/casper/filesystem.kernel-$FLAVOUR $CDDIR/casper/vmlinuz
160
 
            CASPER_KERNEL=/casper/vmlinuz
161
 
        fi
 
154
        mv $CDDIR/casper/filesystem.kernel-$FLAVOUR $CDDIR/casper/vmlinuz
 
155
        CASPER_KERNEL=/casper/vmlinuz
162
156
        CASPER_INITRD="/casper/initrd$(initrd_suffix "$CDDIR/casper/filesystem.initrd-$FLAVOUR")"
163
157
        mv $CDDIR/casper/filesystem.initrd-$FLAVOUR "$CDDIR$CASPER_INITRD"
164
158
    fi