From 6c7bcf5067cfbcdbd76ad3c28aa5828fadfe59c9 Mon Sep 17 00:00:00 2001 From: Samuel Angebault Date: Tue, 11 Dec 2018 04:14:46 -0800 Subject: [PATCH] [device/Arista] fix small issue for the 7170 (#2373) * Fix boot0 install on vfat * Only display the hook name in boot0 Instead of printing the entire path * Update arista driver submodule --- files/Aboot/boot0.j2 | 4 ++-- platform/barefoot/sonic-platform-modules-arista | 2 +- platform/broadcom/sonic-platform-modules-arista | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/files/Aboot/boot0.j2 b/files/Aboot/boot0.j2 index 7420c6a037de..f1d017a82fcd 100644 --- a/files/Aboot/boot0.j2 +++ b/files/Aboot/boot0.j2 @@ -138,7 +138,7 @@ extract_image() { info "Extracting $dockerfs from swi" ## vfat does not support symbol link - if [ -n "$install" ] || [ "$rootfs_type" != "vfat" ]; then + if [ "$rootfs_type" != "vfat" ]; then mkdir -p "$image_path/{{ DOCKERFS_DIR }}" if [ -n "$install" ]; then @@ -326,7 +326,7 @@ run_hooks() { if [ -d "$hook_path/$1" ]; then for hook in $(get_sorted_hooks "$hook_path/$1"); do if [ ! -z "$hook" ]; then - info "Running hook $hook" + info "Running hook $(basename $hook)" . "$hook" fi done diff --git a/platform/barefoot/sonic-platform-modules-arista b/platform/barefoot/sonic-platform-modules-arista index 0fc0c23d8bb8..014865f1ca83 160000 --- a/platform/barefoot/sonic-platform-modules-arista +++ b/platform/barefoot/sonic-platform-modules-arista @@ -1 +1 @@ -Subproject commit 0fc0c23d8bb8826d6431f35aff12ad1a5e098395 +Subproject commit 014865f1ca83ff18680aa90f682cd969692f666a diff --git a/platform/broadcom/sonic-platform-modules-arista b/platform/broadcom/sonic-platform-modules-arista index 0fc0c23d8bb8..014865f1ca83 160000 --- a/platform/broadcom/sonic-platform-modules-arista +++ b/platform/broadcom/sonic-platform-modules-arista @@ -1 +1 @@ -Subproject commit 0fc0c23d8bb8826d6431f35aff12ad1a5e098395 +Subproject commit 014865f1ca83ff18680aa90f682cd969692f666a