| Message ID | 20241101120733.4136790-1-dungeonlords789@naver.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] board/mender: sync with board/pc | expand |
On 01/11/2024 13:07, Cherniaev Andrei wrote: > and fix dd of=sdc because it is very dangerous to have exiting drive in example > > Signed-off-by: Cherniaev Andrei <dungeonlords789@naver.com> > --- > board/mender/x86_64/readme.txt | 8 ++++---- > board/pc/readme.txt | 13 ++++++++----- > 2 files changed, 12 insertions(+), 9 deletions(-) > > diff --git a/board/mender/x86_64/readme.txt b/board/mender/x86_64/readme.txt > index a9755ec58b..01a0254511 100644 > --- a/board/mender/x86_64/readme.txt > +++ b/board/mender/x86_64/readme.txt > @@ -11,14 +11,14 @@ Mender UEFI PC sample config > > $ make > > -2. Write the Pendrive > +2. Write the image > > - The build process will create a Pendrive image called disk.img in > + The build process will create a all-in-one image called disk.img in > output/images. > > Write the image to a pendrive: > > - $ dd if=output/images/disk.img of=/dev/${pendrive}; sync > + $ dd if=output/images/disk.img of=/dev/sdX; sync > > Once the process is complete, insert it into the target PC and boot. > > @@ -66,4 +66,4 @@ particular needs, as this option changes the mender artifact name. > Using mender > ======================== > Please read the mender documentation at: > -https://docs.mender.io/2.2/getting-started > +https://docs.mender.io > diff --git a/board/pc/readme.txt b/board/pc/readme.txt > index 41aec50d36..e2ba6769f0 100644 > --- a/board/pc/readme.txt > +++ b/board/pc/readme.txt > @@ -17,14 +17,14 @@ Bare PC sample config > > $ make > > -2. Write the pendrive > +2. Write the image > > - The build process will create a pendrive image called sdcard.img in > + The build process will create a all-in-one image called disk.img in > output/images. > > Write the image to a pendrive: > > - $ dd if=output/images/disk.img of=/dev/sdc; sync > + $ dd if=output/images/disk.img of=/dev/sdX; sync > > Once it's done insert it into the target PC and boot. > > @@ -42,8 +42,11 @@ Emulation in qemu (BIOS) > 1. Edit grub-bios.cfg > > Since the driver will show up in the virtual machine as /dev/vda, > - change board/pc/grub-bios.cfg to use root=/dev/vda2 instead of > - root=/dev/sda2. Then rebuild grub2 and the image. > + change board/pc/grub-bios.cfg to use root=/dev/vda1 instead of > + root=/dev/sda1. > +1.1. Rebuild grub2 and the image: > + > +make grub2-rebuild && make I see no advantage to adding the "1.1" section. I just joined that to the same line as the preceding one. Applied to master, thanks. Regards, Arnout > > 2. Run the emulation with: >
diff --git a/board/mender/x86_64/readme.txt b/board/mender/x86_64/readme.txt index a9755ec58b..01a0254511 100644 --- a/board/mender/x86_64/readme.txt +++ b/board/mender/x86_64/readme.txt @@ -11,14 +11,14 @@ Mender UEFI PC sample config $ make -2. Write the Pendrive +2. Write the image - The build process will create a Pendrive image called disk.img in + The build process will create a all-in-one image called disk.img in output/images. Write the image to a pendrive: - $ dd if=output/images/disk.img of=/dev/${pendrive}; sync + $ dd if=output/images/disk.img of=/dev/sdX; sync Once the process is complete, insert it into the target PC and boot. @@ -66,4 +66,4 @@ particular needs, as this option changes the mender artifact name. Using mender ======================== Please read the mender documentation at: -https://docs.mender.io/2.2/getting-started +https://docs.mender.io diff --git a/board/pc/readme.txt b/board/pc/readme.txt index 41aec50d36..e2ba6769f0 100644 --- a/board/pc/readme.txt +++ b/board/pc/readme.txt @@ -17,14 +17,14 @@ Bare PC sample config $ make -2. Write the pendrive +2. Write the image - The build process will create a pendrive image called sdcard.img in + The build process will create a all-in-one image called disk.img in output/images. Write the image to a pendrive: - $ dd if=output/images/disk.img of=/dev/sdc; sync + $ dd if=output/images/disk.img of=/dev/sdX; sync Once it's done insert it into the target PC and boot. @@ -42,8 +42,11 @@ Emulation in qemu (BIOS) 1. Edit grub-bios.cfg Since the driver will show up in the virtual machine as /dev/vda, - change board/pc/grub-bios.cfg to use root=/dev/vda2 instead of - root=/dev/sda2. Then rebuild grub2 and the image. + change board/pc/grub-bios.cfg to use root=/dev/vda1 instead of + root=/dev/sda1. +1.1. Rebuild grub2 and the image: + +make grub2-rebuild && make 2. Run the emulation with:
and fix dd of=sdc because it is very dangerous to have exiting drive in example Signed-off-by: Cherniaev Andrei <dungeonlords789@naver.com> --- board/mender/x86_64/readme.txt | 8 ++++---- board/pc/readme.txt | 13 ++++++++----- 2 files changed, 12 insertions(+), 9 deletions(-)