Skip to content

Commit b6f783f

Browse files
authored
Revert "Move /var/log to RAM for Mellanox SN2700, Nokia 7215 and Dell S6100 (#15077)" (#16775) (#16886)
1 parent b380d99 commit b6f783f

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
CONSOLE_PORT=0x2f8
22
CONSOLE_DEV=1
3-
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"
3+
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"
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="acpi_enforce_resources=lax acpi=noirq logs_inram=on"
1+
ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="acpi_enforce_resources=lax acpi=noirq"
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
VAR_LOG_SIZE=4096
2-
ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="logs_inram=on"

platform/marvell-armhf/platform.conf

+2-1
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,8 @@ prepare_boot_menu() {
176176
fi
177177
BORDER='echo "---------------------------------------------------";echo;'
178178
fw_setenv ${FW_ARG} print_menu "$BORDER $BOOT1 $BOOT2 $BOOT3 $BORDER" > /dev/null
179-
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
179+
180+
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
180181
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
181182

182183
# Set boot configs

0 commit comments

Comments
 (0)