Merge pull request #389 from plexinc/update-fix-config-txt

Add Custom config.txt copy to boot loader during update and version check
This commit is contained in:
MilhouseVH 2016-06-10 12:38:49 +01:00 committed by GitHub
commit b44cdc7732
4 changed files with 20 additions and 1 deletions

View File

@ -108,3 +108,10 @@
# all values below this line were inserted from config.txt.bk (your old config)
# and can be merged with the above values
################################################################################
################################################################################
# Include distribution specific config file if it exists.
################################################################################
[all]
include distroconfig.txt

View File

@ -48,7 +48,13 @@ makeinstall_target() {
[ -f dt-blob.bin ] && cp -PRv dt-blob.bin $INSTALL/usr/share/bootloader/dt-blob.bin
cp -PRv $PKG_DIR/scripts/update.sh $INSTALL/usr/share/bootloader
if [ -f $DISTRO_DIR/$DISTRO/config/distroconfig.txt ]; then
cp -PRv $DISTRO_DIR/$DISTRO/config/distroconfig.txt $INSTALL/usr/share/bootloader
else
cp -PRv $PKG_DIR/files/3rdparty/bootloader/distroconfig.txt $INSTALL/usr/share/bootloader
fi
if [ -f $DISTRO_DIR/$DISTRO/config/config.txt ]; then
cp -PRv $DISTRO_DIR/$DISTRO/config/config.txt $INSTALL/usr/share/bootloader
else

View File

@ -53,6 +53,12 @@
# sed -e "s,gpu_mem=100,gpu_mem=128,g" -i $BOOT_ROOT/config.txt
# sed -e "s,gpu_mem_256=100,# gpu_mem_256=128,g" -i $BOOT_ROOT/config.txt
# sed -e "s,gpu_mem_512=128,# gpu_mem_512=128,g" -i $BOOT_ROOT/config.txt
# Add distribution specific extra configuration file for the bootloader
fi
# Add distro config file.
if [ -f $SYSTEM_ROOT/usr/share/bootloader/distroconfig.txt ]; then
cp -p $SYSTEM_ROOT/usr/share/bootloader/distroconfig.txt $BOOT_ROOT
fi
# mount $BOOT_ROOT r/o