From patchwork Wed Aug 16 09:49:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Kalashnikov X-Patchwork-Id: 801972 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=googlegroups.com (client-ip=2607:f8b0:400e:c00::240; helo=mail-pf0-x240.google.com; envelope-from=swupdate+bncbd7ivpnd34mbbonk2dgakgqernk272y@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="mXVXhTqW"; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="AJRMktsd"; dkim-atps=neutral Received: from mail-pf0-x240.google.com (mail-pf0-x240.google.com [IPv6:2607:f8b0:400e:c00::240]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xXPhX29Flz9t4Z for ; Wed, 16 Aug 2017 19:49:47 +1000 (AEST) Received: by mail-pf0-x240.google.com with SMTP id y19sf511276pfi.1 for ; Wed, 16 Aug 2017 02:49:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:date:from:to:cc:message-id:in-reply-to:references:subject :mime-version:x-original-sender:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-subscribe:list-unsubscribe; bh=S9zCe1ynOu5BBy3cm47gu8aUEGpMLhL45GGzHQCjRkM=; b=mXVXhTqWWZT3X3W1bYHFokROqZXBVgsbGbB76/HNR6XQCzscNWqKWVRl0eosxHYaLR 9N+22vGZmh9fXImwmNltu2H7gD2zBV0RQf1eIm8O0A/HqIX+Qqk4jx9ADQKyBJgE2klW i0TzTg6z+NC3J/LVklDe1UZvCj5N9dMU0BdKzBceVipjs3+UPy8+7n9Gp1DRet40wYFa f2VR2QT66H3qv9CR0wkwh+tYwpTfDu41UYIDwKHom9FtC5aiyIsawOCcol38NfxhI38X 2DuEYZsnbFG11TzflB5VA4UEfnc+SbOTfUivOP0TygGPn1UFISF50unMx9luJ7KYU91s wSrQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:message-id:in-reply-to:references:subject :mime-version:x-original-sender:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-subscribe:list-unsubscribe; bh=S9zCe1ynOu5BBy3cm47gu8aUEGpMLhL45GGzHQCjRkM=; b=AJRMktsdj//gsrVDhe/1zqAg5W8XUB1CW1JfDoLP7vNKXCMaoX3gdyqnej0nDsdLQU qsvmNOaIOLY1KoTR/E+lkwUJwrlAcRa5XYZv+2i7zalIok5qOkhi7y8mg8OZi082Bf0M sRtXW83LGiGGyrhlBHMo//W/CfxUCjNJFczuhqIHqbUmqIKzZyN/C9PQSYShVDOD2t48 g7w5+FfJbWNjoqgK7JRxp8uB60KuWn+SpeDPEJh/aEL7gGQppsd+9PH3vPCHmHHbcXn5 bT4b8lg0bWwAnlRTqRi5sAt9KTFsGPENaH+mrhM/uWi2feGFI5m0FS/HNkroG6p5Zz18 kJoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:date:from:to:cc:message-id:in-reply-to :references:subject:mime-version:x-original-sender:precedence :mailing-list:list-id:x-spam-checked-in-group:list-post:list-help :list-archive:list-subscribe:list-unsubscribe; bh=S9zCe1ynOu5BBy3cm47gu8aUEGpMLhL45GGzHQCjRkM=; b=PH3yGyrM28Gg9lzd+Bo+fRRSH9swq5Is/8robEJHmfHXc05zUFfqlfWFHJbOR/VLOg Gz0e39/O4QJCgMzjCylDK6QTw+YnpnxvEj7OOBdhvXMS62AxXpVCM2frTS2bag927Qeu 2tNddzZb3wzrQPExaoPfhLm0UWhmUqiieFUjvbWNkasL7ro84ouYFG840S7bzY0lmT8h cDyPr40pIV7Y3XjkVeQOtS/Qs2PgAHRUgJbW4OOuIqUhS07GHqWyXGu52ZyBLpTKyHcZ Zq6IgMpMAtgAz1MWkhuwRJfrBU+4NxPxoNtkBVjAiewVNfBjQ/ZPxNFSwLING4nws+b3 fSDQ== Sender: swupdate@googlegroups.com X-Gm-Message-State: AHYfb5i0Mz0hrv0NWoOulu78qi/Fq5H3G5jGdLpYccOPS8jMnl7LmupJ XB1z95ayIitLdg== X-Received: by 10.36.82.208 with SMTP id d199mr67782itb.7.1502876985246; Wed, 16 Aug 2017 02:49:45 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 10.107.8.136 with SMTP id h8ls809591ioi.20.gmail; Wed, 16 Aug 2017 02:49:45 -0700 (PDT) X-Received: by 10.31.99.198 with SMTP id x189mr9150vkb.24.1502876984948; Wed, 16 Aug 2017 02:49:44 -0700 (PDT) Date: Wed, 16 Aug 2017 02:49:44 -0700 (PDT) From: Roman Kalashnikov To: swupdate Cc: sbabic@denx.de Message-Id: <19ca798c-96d0-478b-a205-8b7d543e3ff9@googlegroups.com> In-Reply-To: References: <2b909d5f-7a57-4d19-ab15-fab2792cdc69@googlegroups.com> <548d4778-95ae-ed0e-f49b-0bdf3f97fd35@denx.de> <35dd9659-b9fb-b484-cae9-849c4b50335e@denx.de> Subject: Re: [swupdate] Can not understand bootloader (grub) option MIME-Version: 1.0 X-Original-Sender: lunix0x@gmail.com Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , Hi! I'm not sure for correct way to upload patches by using *github* pull-request, so i just post git-diff here: ``` ``` My sw-description posted here https://pastebin.com/9YyTsDDB. For "*GRUB* supporting" i had to reconfigure it while zero-provision stage (before using *swupdate*): 1. grub-install --boot-directory=/boot --bootloader-id=ubuntu --target=x86_64-efi --efi-directory=/boot/efi --recheck --debug /dev/sda 2. grub-mkconfig -o /boot/efi/EFI/ubuntu/grub.cfg 3. grub-editenv /boot/efi/EFI/ubuntu/grubenv create It creates *grub.cfg* by the "right way". It is resason i don't post grub.cfg here - it creates automactiacally. Then i build swupdate with *GRUB* params in *.config*: CONFIG_GRUBENV_PATH="/boot/efi/EFI/ubuntu/grubenv" CONFIG_BOOTLOADER_GRUB=y Now i can use swupdate traditionaly. Best regards, Roman. diff --git a/doc/source/sw-description.rst b/doc/source/sw-description.rst index b4e8d75..4a798ee 100644 --- a/doc/source/sw-description.rst +++ b/doc/source/sw-description.rst @@ -548,26 +548,6 @@ that must be changed: SWUpdate will internally generate a script that will be passed to the bootloader handler for adjusting the environment. -For example to use GRUB environment - after update some of partition -and boot from it: - -:: - - bootenv: ( - { - name = "default"; - value = "1"; - }, - { - name = "fallback"; - value = "0"; - }, - ) - -Note the `value` must contain correct partition's number in -GRUB menuentry. Also `bootenv` can contains variable like `fallback` -for failsafe boot if the new default menu entry fails to boot. - For backward compatibility with previously built .swu images, "uboot "group name is still relevant (as an alias).