From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on sa.local.altlinux.org X-Spam-Level: X-Spam-Status: No, score=-4.3 required=5.0 tests=ALL_TRUSTED,BAYES_00, RP_MATCHES_RCVD autolearn=unavailable autolearn_force=no version=3.4.1 To: devel-distro@lists.altlinux.org, Alexey Gladkov References: <20200817165619.mnplmex2kz2rlwif@comp-core-i7-2640m-0182e6> <20200817174700.GF5990@imap.altlinux.org> <20200817194045.sofkfcay7ktbbmdt@comp-core-i7-2640m-0182e6> <20200824195642.fdejliv2ap4cbzj6@comp-core-i7-2640m-0182e6> <20200830172801.GB10122@imap.altlinux.org> <20200831100141.ilee5beho5htpmaw@comp-core-i7-2640m-0182e6> <20200901102616.GA13764@imap.altlinux.org> From: Nikolai Kostrigin Autocrypt: addr=nickel@basealt.ru; prefer-encrypt=mutual; keydata= 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 +Q== Organization: BaseALT Message-ID: <46267584-d677-6edf-5c19-23f973f8f61f@basealt.ru> Date: Thu, 17 Sep 2020 16:48:28 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.9.0 MIME-Version: 1.0 In-Reply-To: <20200901102616.GA13764@imap.altlinux.org> Content-Type: multipart/mixed; boundary="------------9C872EE83801B49B72F76466" Content-Language: en-US Subject: Re: [devel-distro] mki-copy-efiboot fixes X-BeenThere: devel-distro@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: nickel@basealt.ru, Distributions development List-Id: Distributions development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Sep 2020 13:48:33 -0000 Archived-At: List-Archive: This is a multi-part message in MIME format. --------------9C872EE83801B49B72F76466 Content-Type: text/plain; charset=koi8-r Content-Transfer-Encoding: base64 CjAxLjA5LjIwMjAgMTM6MjYsIE1pY2hhZWwgU2hpZ29yaW4g0MnbxdQ6Cj4gT24gTW9uLCBB dWcgMzEsIDIwMjAgYXQgMTI6MDE6NDFQTSArMDIwMCwgQWxleGV5IEdsYWRrb3Ygd3JvdGU6 Cj4+Pj4g98/UIMfP1M/Xz8Ug2sHEwc7JxSDEzNEg1MXT1MnSz9fBzsnROgo+Pj4+IGh0dHA6 Ly9naXQuYWx0bGludXgub3JnL3Rhc2tzLzI1NjczNQo+Pj4g8NLP29Ug0NLP3cXOydEg2sEg 09fPyiDLz9PRyywgzsXEz9PNz9TSxcwgxd2jIM/EztUg09TSz97L1Qo+Pj4g1yB0b29scy5t azoKPj4+ICtDSFJPT1RfQ09QWV9FMktCT09UICAgID89ICQoVE9PTFNESVIpL21raS1jb3B5 LWUya2Jvb3QKPj4+IOvB08HF1NPRIF/Uz8zYy89fIGUyay4KPj4g78LOz9fJzCDawcTBzsnF Ogo+PiBodHRwOi8vZ2l0LmFsdGxpbnV4Lm9yZy90YXNrcy8yNTY3MzUKPiD10sEsINMg3NTJ zSDX06MgyM/Sz9vPIDotKQo+Cj4g5dPMySDCz8zY28UgzsnLz8fPIM7FINbEo9vYIC0tINDS xcTMwcfBwCDQ1dPLwdTYINcg08naycYuCvDSxcTMwcfBwCDQz9DSwdfJ1Nggxd3FINDB0tUg zcXT1CwgzM/NwcDdycgg2sHH0tXay9Ugyc7T1MHMzNHUz9LBINcK0sXWyc3FIEVGSSDEzNEg eDY0IMkgaWEzMi4K98HSycHO1CDSxdvFzsnRINTV1DoKaHR0cDovL2dpdC5hbHRsaW51eC5v cmcvcGVvcGxlL25pY2tlbC9wYWNrYWdlcy8/cD1ta2ltYWdlLmdpdDthPXNob3J0bG9nO2g9 cmVmcy9oZWFkcy9maXhfRUZJX2luc3RhbGxlcl9jb25maWdzCgrpzMkg080uINfMz9bFzsnF Lgo+Ci0tIApCZXN0IHJlZ2FyZHMsCk5pa29sYWkgS29zdHJpZ2luCgo= --------------9C872EE83801B49B72F76466 Content-Type: text/x-patch; charset=UTF-8; name="0001-mki-copy-efiboot-chrooted-remove-extra-slash-in-boot.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0001-mki-copy-efiboot-chrooted-remove-extra-slash-in-boot.pa"; filename*1="tch" =46rom c7a030288956f52f2070d95a9d17d14f608704ac Mon Sep 17 00:00:00 2001 From: Nikolai Kostrigin Date: Thu, 17 Sep 2020 14:54:14 +0300 Subject: [PATCH 1/2] mki-copy-efiboot-chrooted: remove extra slash in bootloader path Path starting with double slash, like: //EFI/BOOT/.efi confuses rEFInd making further boot impossible --- tools/mki-copy-efiboot-chrooted | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/mki-copy-efiboot-chrooted b/tools/mki-copy-efiboot-chr= ooted index 2075e8e..80b1887 100644 --- a/tools/mki-copy-efiboot-chrooted +++ b/tools/mki-copy-efiboot-chrooted @@ -293,7 +293,7 @@ refind_add_stage2() case "$1" in x64) # ELILO used as SB trampoline for unsigned kernels - loader=3D"/$boot/elilo.efi" + loader=3D"$boot/elilo.efi" # NB: -v seems critical, otherwise we hit this: # gzip_x86_64: invalid exec_header options=3D"-v -i full.cz vmlinuz `bootparams $root` $splash" @@ -301,7 +301,7 @@ refind_add_stage2() ia32) # GRUB-EFI is used as SB trampoline for unsigned kernels # for ia32 EFI on x86_64 platforms - loader=3D"/$boot/grubia32_ldr.efi" + loader=3D"$boot/grubia32_ldr.efi" options=3D"" ;; *) --=20 2.25.4 --------------9C872EE83801B49B72F76466 Content-Type: text/x-patch; charset=UTF-8; name="0002-mki-copy-efiboot-chrooted-fix-label-variable-visibil.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0002-mki-copy-efiboot-chrooted-fix-label-variable-visibil.pa"; filename*1="tch" =46rom 23fd2ec24cd8a5e9d1685ffa448db55788e7b45a Mon Sep 17 00:00:00 2001 From: Nikolai Kostrigin Date: Thu, 17 Sep 2020 15:11:10 +0300 Subject: [PATCH 2/2] mki-copy-efiboot-chrooted: fix label variable visibi= lity scope add_grub_cfg() being called from copy_refind() was broken due to $label was not set in that scope causing "unbound variable" error ++ add_grub_cfg ++ cat /.host/efiboot-chrooted: line 348: label: unbound variable ++ : ++ copy_kernel --- tools/mki-copy-efiboot-chrooted | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tools/mki-copy-efiboot-chrooted b/tools/mki-copy-efiboot-chr= ooted index 80b1887..a75a3b8 100644 --- a/tools/mki-copy-efiboot-chrooted +++ b/tools/mki-copy-efiboot-chrooted @@ -223,8 +223,6 @@ copy_grub() =20 cp $verbose -Lf /boot/grub/fonts/unicode.pf2 "$boot/fonts" cp $verbose -Lf /boot/grub/unifont.pf2 "$boot" - - # add_grub_cfg } =20 refind_add_stage_submenu() @@ -263,7 +261,7 @@ refind_add_stage_submenu() =20 refind_add_stage2() { - local root icon splash label loader options + local root icon splash loader options =20 for root in $stage2; do case "$root" in @@ -369,7 +367,7 @@ refind_cfg_add_autodetect() { =20 copy_refind() { - local refind_aux refind_boot refind_bootia32 refind_icons icon_format s= can_icon + local label refind_aux refind_boot refind_bootia32 refind_icons icon_fo= rmat scan_icon =20 refind_aux=3D"$efi/refind" refind_boot=3D"$refind_aux/refind_x64.efi" @@ -459,7 +457,7 @@ copy_refind() REFIND_EOF } > "$boot/refind_ia32.conf" =20 - add_grub_cfg || : + add_grub_cfg } =20 #find out if all bootloader stages have ia32 binaries in the package --=20 2.25.4 --------------9C872EE83801B49B72F76466--