From 61683d9d64d8a70c45026f3a142ee83d5fef8ed1 Mon Sep 17 00:00:00 2001
From: Ashwin Srinivasan <93744978+assrinivasan@users.noreply.github.com>
Date: Wed, 11 Oct 2023 10:36:29 -0700
Subject: [PATCH] Revert "Move /var/log to RAM for Mellanox SN2700, Nokia 7215
 and Dell S6100 (#15077)" (#16775)

This reverts commit 05f326eed97590e6a27b8db2cb779465e5f71cce.

Microsoft ADO 25355843:
---
 device/dell/x86_64-dell_s6100_c2538-r0/installer.conf  | 2 +-
 device/mellanox/x86_64-mlnx_msn2700-r0/installer.conf  | 2 +-
 device/nokia/armhf-nokia_ixs7215_52x-r0/installer.conf | 1 -
 platform/marvell-armhf/platform.conf                   | 3 ++-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/installer.conf b/device/dell/x86_64-dell_s6100_c2538-r0/installer.conf
index 6ce0ab077f..e87b44df61 100644
--- a/device/dell/x86_64-dell_s6100_c2538-r0/installer.conf
+++ b/device/dell/x86_64-dell_s6100_c2538-r0/installer.conf
@@ -1,3 +1,3 @@
 CONSOLE_PORT=0x2f8
 CONSOLE_DEV=1
-ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="module_blacklist=gpio_ich,wdat_wdt acpi_no_watchdog=1 nos-config-part=/dev/sda12 logs_inram=on i2c-i801.disable_features=0x10"
\ No newline at end of file
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="module_blacklist=gpio_ich,wdat_wdt acpi_no_watchdog=1 nos-config-part=/dev/sda12 i2c-i801.disable_features=0x10"
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/installer.conf b/device/mellanox/x86_64-mlnx_msn2700-r0/installer.conf
index eb12e734bb..c9c9493a54 100644
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/installer.conf
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/installer.conf
@@ -1 +1 @@
-ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="acpi_enforce_resources=lax acpi=noirq logs_inram=on"
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="acpi_enforce_resources=lax acpi=noirq"
diff --git a/device/nokia/armhf-nokia_ixs7215_52x-r0/installer.conf b/device/nokia/armhf-nokia_ixs7215_52x-r0/installer.conf
index 36696d2703..b138f294e1 100644
--- a/device/nokia/armhf-nokia_ixs7215_52x-r0/installer.conf
+++ b/device/nokia/armhf-nokia_ixs7215_52x-r0/installer.conf
@@ -1,2 +1 @@
 VAR_LOG_SIZE=4096
-ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="logs_inram=on"
diff --git a/platform/marvell-armhf/platform.conf b/platform/marvell-armhf/platform.conf
index 7d551b21f4..c3b7c08959 100644
--- a/platform/marvell-armhf/platform.conf
+++ b/platform/marvell-armhf/platform.conf
@@ -176,7 +176,8 @@ prepare_boot_menu() {
     fi
     BORDER='echo "---------------------------------------------------";echo;'
     fw_setenv ${FW_ARG} print_menu "$BORDER $BOOT1 $BOOT2 $BOOT3 $BORDER" > /dev/null
-    fw_setenv ${FW_ARG} linuxargs "net.ifnames=0 loopfstype=squashfs loop=$image_dir/$FILESYSTEM_SQUASHFS systemd.unified_cgroup_hierarchy=0 varlog_size=$VAR_LOG_SIZE loglevel=4 ${extra_cmdline_linux} ${ONIE_PLATFORM_EXTRA_CMDLINE_LINUX}" > /dev/null
+
+    fw_setenv ${FW_ARG} linuxargs "net.ifnames=0 loopfstype=squashfs loop=$image_dir/$FILESYSTEM_SQUASHFS systemd.unified_cgroup_hierarchy=0 varlog_size=$VAR_LOG_SIZE loglevel=4 ${extra_cmdline_linux}" > /dev/null
     fw_setenv ${FW_ARG} linuxargs_old "net.ifnames=0 loopfstype=squashfs loop=$image_dir_old/$FILESYSTEM_SQUASHFS systemd.unified_cgroup_hierarchy=0 varlog_size=$VAR_LOG_SIZE loglevel=4" > /dev/null
 
     # Set boot configs