← Back to branch summary

~fginther/livecd-rootfs/xenial-proposed-unminimized-standard

« back to all changes in this revision

Viewing changes to live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary

  • Committer: Steve Langasek
  • Date: 2018-06-08 01:11:27 UTC
  • mfrom: (1459.1.2 xenial-proposed)
  • Revision ID: steve.langasek@canonical.com-20180608011127-jsel6lx1j6jr15xe
Tags: 2.408.32
Merge lp:~rcj/livecd-rootfs/xenial-proposed

Show diffs side-by-side

added added

removed removed

Lines of Context:
live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary
9
9
        ;;
10
10
esac
11
11
 
 
12
IMAGE_STR="# CLOUD_IMG: This file was created/modified by the Cloud Image build process"
 
13
FS_LABEL="cloudimg-rootfs"
 
14
 
 
15
. config/binary
 
16
 
12
17
. config/functions
13
18
 
14
19
create_partitions() {
88
93
    esac
89
94
 
90
95
    cat << EOF >> mountpoint/etc/default/grub.d/50-cloudimg-settings.cfg
91
 
${CLOUD_IMG_STR}
 
96
${IMAGE_STR}
92
97
# For Cloud Image compatability
93
98
GRUB_PRELOAD_MODULES="${GRUB_PRELOAD_MODULES:-$grub_modules}"
94
99
EOF
104
109
 
105
110
    if [ -f mountpoint/boot/efi/EFI/BOOT/grub.cfg ]; then
106
111
        sed -i "s| root| root hd0,gpt1|" mountpoint/boot/efi/EFI/BOOT/grub.cfg
107
 
        sed -i "1i${CLOUD_IMG_STR}" mountpoint/boot/efi/EFI/BOOT/grub.cfg
 
112
        sed -i "1i${IMAGE_STR}" mountpoint/boot/efi/EFI/BOOT/grub.cfg
108
113
        # For some reason the grub disk is looking for /boot/grub/grub.cfg on
109
114
        # part 15....
110
115
        chroot mountpoint mkdir -p /boot/efi/boot/grub