Merge pull request #3838 from HiassofT/le92-init-toram

[le92] init: make copying SYSTEM to RAM opt-in
This commit is contained in:
MilhouseVH 2019-09-18 17:16:33 +01:00 committed by GitHub
commit a6459fe37e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -41,9 +41,6 @@ GRUB_DEFAULT=""
NBD_DEVS="0" NBD_DEVS="0"
FLASH_FREE_MIN="5" FLASH_FREE_MIN="5"
INSTALLED_MEMORY=$(cat /proc/meminfo | grep 'MemTotal:' | awk '{print $2}')
SYSTEM_TORAM_LIMIT=1024000
LIVE="no" LIVE="no"
BREAK_TRIPPED="no" BREAK_TRIPPED="no"
@ -914,11 +911,11 @@ check_update() {
prepare_sysroot() { prepare_sysroot() {
progress "Preparing system" progress "Preparing system"
if [ "$SYSTEM_TORAM" = "no" -o "$INSTALLED_MEMORY" -lt "$SYSTEM_TORAM_LIMIT" ]; then if [ "$SYSTEM_TORAM" = "yes" ]; then
mount_part "/flash/$IMAGE_SYSTEM" "/sysroot" "ro,loop"
else
cp /flash/$IMAGE_SYSTEM /dev/$IMAGE_SYSTEM cp /flash/$IMAGE_SYSTEM /dev/$IMAGE_SYSTEM
mount_part "/dev/$IMAGE_SYSTEM" "/sysroot" "ro,loop" mount_part "/dev/$IMAGE_SYSTEM" "/sysroot" "ro,loop"
else
mount_part "/flash/$IMAGE_SYSTEM" "/sysroot" "ro,loop"
fi fi
mount --move /flash /sysroot/flash mount --move /flash /sysroot/flash
@ -1019,11 +1016,8 @@ for arg in $(cat /proc/cmdline); do
nosplash) nosplash)
SPLASH=no SPLASH=no
;; ;;
noram) toram)
SYSTEM_TORAM=no SYSTEM_TORAM=yes
;;
ramlimit=*)
SYSTEM_TORAM_LIMIT="${arg#*=}"
;; ;;
live) live)
LIVE=yes LIVE=yes