[installer]: fix armhf for installer.conf usage (#11121)
This fixes the build for armhf to be able to use '/device///installer.conf' files. Specifically, armhf needs support to be able to change the size of /var/log/ directory. It is hardcoded to 512 bytes on all armhf platforms currently. This change will allow any armhf platform to be able to use an installer.conf file to customize the installed image.
This commit is contained in:
parent
8fc5c9b31f
commit
b2685736e0
@ -71,12 +71,12 @@ generate_onie_installer_image()
|
||||
output_file=$OUTPUT_ONIE_IMAGE
|
||||
[ -n "$1" ] && output_file=$1
|
||||
# Copy platform-specific ONIE installer config files where onie-mk-demo.sh expects them
|
||||
rm -rf ./installer/x86_64/platforms/
|
||||
mkdir -p ./installer/x86_64/platforms/
|
||||
rm -rf ./installer/${TARGET_PLATFORM}/platforms/
|
||||
mkdir -p ./installer/${TARGET_PLATFORM}/platforms/
|
||||
for VENDOR in `ls ./device`; do
|
||||
for PLATFORM in `ls ./device/$VENDOR`; do
|
||||
for PLATFORM in `ls ./device/$VENDOR | grep ^${TARGET_PLATFORM}`; do
|
||||
if [ -f ./device/$VENDOR/$PLATFORM/installer.conf ]; then
|
||||
cp ./device/$VENDOR/$PLATFORM/installer.conf ./installer/x86_64/platforms/$PLATFORM
|
||||
cp ./device/$VENDOR/$PLATFORM/installer.conf ./installer/${TARGET_PLATFORM}/platforms/$PLATFORM
|
||||
fi
|
||||
|
||||
done
|
||||
|
@ -9,7 +9,6 @@ kernel_addr=0x1100000
|
||||
fdt_addr=0x1000000
|
||||
fdt_high=0x10fffff
|
||||
initrd_addr=0x2000000
|
||||
VAR_LOG=512
|
||||
|
||||
kernel_fname="/boot/vmlinuz-5.10.0-12-2-armmp"
|
||||
initrd_fname="/boot/initrd.img-5.10.0-12-2-armmp"
|
||||
@ -147,8 +146,8 @@ prepare_boot_menu() {
|
||||
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 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 loglevel=4" > /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
|
||||
fw_setenv ${FW_ARG} kernel_addr $kernel_addr > /dev/null
|
||||
|
Loading…
Reference in New Issue
Block a user