matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[202012] Revert "Move /var/log to RAM for Mlnx SN2700, Nokia 7215 and Dell S6100" (#16815)

Browse Source 
This reverts commit f9d83c6e17.

#### Why I did it
To ease concerns on log2ram raised by Mellanox

##### Work item tracking
- Microsoft ADO **25355843**

#### How I did it
Reverting the aforementioned commit and resolving merge conflicts in Dell's installer.conf file

#### Description for the changelog
Reverted the changes to the installer.conf files in three platforms to remove the log_inram option, thereby ensuring /var/log/ would not be mounted on tmpfs.
This commit is contained in:
Ashwin Srinivasan 2023-10-20 14:13:40 -07:00 committed by GitHub
parent 8c9e2ea10f
commit baec520743
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
device/dell/x86_64-dell_s6100_c2538-r0/installer.conf
View File

@ -1,3 +1,3 @@
CONSOLE_PORT=0x2f8 CONSOLE_PORT=0x2f8
CONSOLE_DEV=1 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" ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="module_blacklist=gpio_ich,wdat_wdt acpi_no_watchdog=1 nos-config-part=/dev/sda12"

2
device/mellanox/x86_64-mlnx_msn2700-r0/installer.conf
View File

@ -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"

1
device/nokia/armhf-nokia_ixs7215_52x-r0/installer.conf
View File

@ -1,2 +1 @@
VAR_LOG_SIZE=4096 VAR_LOG_SIZE=4096
ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="logs_inram=on"

2
platform/marvell-armhf/platform.conf
View File

@ -177,7 +177,7 @@ prepare_boot_menu() {
BORDER='echo "---------------------------------------------------";echo;' BORDER='echo "---------------------------------------------------";echo;'
fw_setenv ${FW_ARG} print_menu "$BORDER $BOOT1 $BOOT2 $BOOT3 $BORDER" > /dev/null 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 ${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" > /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 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 # Set boot configs