SONiC-to-SONiC update

[andriymoroz-mlnx]

Usage:

• build as usual
• install sonic-xxx.bin image via ONIE
• install any following updates from SONiC (same as in ONIE: scp and execute)

[lguohan]

@qiluo-msft, please review

[qiluo-msft]

image-%%GIT_REVISION%% [](start = 33, length = 22)

image-%%GIT_REVISION%% [](start = 33, length = 22)

One suggestion: could you also explore the possibility to dynamically get the path? Ideally the image content should not have the knowledge of its own revision/version.

Some mechanism I can think of, but not limited to:

1. kernel argument, provided by bootloader ONIE/Aboot/etc.
2. parse /proc/cmdline
3. parse a file with image version on the disk

Then we can remove the %GIT_REVISION% from build_debian.sh #Closed

[andriymoroz-mlnx]

ok, I will rework all GIT_REVISION places after Marian pushes updated versioning

[qiluo-msft]

Thanks!

---

In reply to: 109391921 [](ancestors = 109391921)

[andriymoroz-mlnx]

Fixed

[qiluo-msft]

GIT_REVISION [](start = 22, length = 12)

GIT_REVISION [](start = 22, length = 12)

The same. Is it possible to get it programmatically? #Closed

[qiluo-msft]

demo_volume_revision_label [](start = 0, length = 26)

I am quite confused. Why not keep it unchanged and use $demo_volume_label? #Closed

[qiluo-msft]

mkdir $demo_mnt/$sonic_dir [](start = 0, length = 26)

If the directory already exist, it is better to clean up and reinstall it. #Closed

[qiluo-msft]

running_sonic_revision [](start = 4, length = 22)

Instead of finding the running revision, we can easily find the default entry in grub.cfg. So it is runnable both in ONIE and in sonic, you don't need if-condition. #Closed

[andriymoroz-mlnx]

I'm checking for currently running version in order to keep it. It could happen currently running is not the default one #Closed

[qiluo-msft]

You're correct. Thanks!

---

In reply to: 109413786 [](ancestors = 109413786)

[qiluo-msft]

We don't care ONIE/sonic for the grub_cfg code here. We can just check if there is already sonic entry in grub.cfg or not.

[andriymoroz-mlnx]

I wanted to keep ONIE menu entry at the bottom and it is much simple to append text to the grub.cfg than insert it to the middle.

[qiluo-msft]

I said nothing related to entry order.

---

In reply to: 109420255 [](ancestors = 109420255)

[andriymoroz-mlnx]

grub.cfg is recreated on any installation ONIE or SONiC.
Here this "if" is needed to add ONIE submenu only in case of ONIE install or old menuitem+ONIE submenu in case of SONiC install. Also "ONIE submenu" source is different in both cases

[qiluo-msft]

The same. Just check grub.cfg to determin if we need to remove extra images.

[andriymoroz-mlnx]

I doubt the code will be simpler. Maybe I'm wrong - I'm not a real shell-script jedi...
And besides if we decide to change menu item format - guessing directory name to remove will require some legacy code

[andriymoroz-mlnx]

Enumerating thru the directories is much simpler than thru the menuitems in grub.cfg
Also in this case we get the exact image directory name we need to remove.

[qiluo-msft]

Keep it as is? #Closed

[qiluo-msft]

As comments.

[andriymoroz-mlnx]

Before I added support for installation form SONiC there were two options ONIE and some Linux. I'm not aware about the installation from Linux (some other platforms?) so I tried to keep the old code under "if != sonic" and add new "under if = sonic".

[qiluo-msft]

You should reuse the code to detect ONIE/Sonic.

---

In reply to: 109438459 [](ancestors = 109438459)

[qiluo-msft]

sonic [](start = 17, length = 5)

Prefer say the environment as 'linux' #Closed

[lguohan]

onie is also linux, sonic is more precise, IMHO

[lguohan]

I think this change is going to break the arista aboot image.

if you search DOCKERFS_DIR, it is also used in files/initramfs-tools/arista-convertfs.j2 and files/Aboot/boot0.j2

[lguohan]

I do not need this commit to support sonic-to-sonic on arista aboot platform, but it is better not to break the existing func.

[lguohan]

Running NOT in SONiC [](start = 10, length = 20)

-> Install SONiC in ONIE

[lguohan]

Running in SONiC [](start = 10, length = 16)

-> Installing SONiC in SONiC

[lguohan]

environment -> install_env

[lguohan]

sonic_dir [](start = 0, length = 9)

sonic_dir -> image_dir

[lguohan]

can we also check the var-log size since the new sonic image may increase or descreae the file size.

Can we compare the size, if they are not the same then try to create a new one with new size.

[lguohan]

rename to onie_menuentry

[lguohan]

rename grub_cfg to new_sonic_menuentry

[lguohan]

rename to old_sonic_menuentry

[lguohan]

I suggest to move this logic before we do the installation, it will save some space.

[stcheng]

sonic -> SONiC

[qiluo-msft]

@andriymoroz-mlnx Could you resolve the conflicts? #Closed

[andriymoroz-mlnx]

resolved conflicts

[andriymoroz-mlnx]

Updated. Used version string instead of git hash
GRUB menu example:

                          GNU GRUB  version 2.02~beta3

 +----------------------------------------------------------------------------+
 |*SONiC-OS-S2S_VER.6-dirty                                                   |
 | SONiC-OS-S2S_VER.4-dirty                                                   |
 | ONIE                                                                       |
 |                                                                            |

Directories with sonic images:

root@arc-switch1025:/home/admin# ls -l /host/
total 36
drwxr-xr-x 2 root root  4096 Apr 12 11:43 disk-img
drwxr-xr-x 5 root root  4096 Apr 12 11:45 grub
drwxr-xr-x 6 root root  4096 Apr 12 13:38 image-S2S_VER.4-dirty
drwxr-xr-x 6 root root  4096 Apr 12 14:21 image-S2S_VER.6-dirty
drwx------ 2 root root 16384 Apr 12 11:43 lost+found
-rw-r--r-- 1 root root   329 Apr 12 11:45 machine.conf
root@arc-switch1025:/home/admin#

@lguohan, @qiluo-msft, @stcheng please review