mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
Merge pull request #4071 from stefansaraev/livemode
rework live mode and clean up
This commit is contained in:
commit
8bb721ae40
@ -55,6 +55,8 @@
|
||||
INSTALLED_MEMORY=`cat /proc/meminfo | grep 'MemTotal:' | awk '{print $2}'`
|
||||
SYSTEM_TORAM_LIMIT=1024000
|
||||
|
||||
LIVE="no"
|
||||
|
||||
# hide kernel log messages on console
|
||||
echo '1 4 1 7' > /proc/sys/kernel/printk
|
||||
|
||||
@ -129,6 +131,9 @@
|
||||
noram)
|
||||
SYSTEM_TORAM=no
|
||||
;;
|
||||
live)
|
||||
LIVE=yes
|
||||
;;
|
||||
overlay)
|
||||
OVERLAY=yes
|
||||
;;
|
||||
@ -491,6 +496,12 @@
|
||||
mount_storage() {
|
||||
progress "Mounting storage"
|
||||
|
||||
if [ "$LIVE" = "yes" ]; then
|
||||
# mount tmpfs and exit early. disk=xx is not allowed in live mode
|
||||
mount -t tmpfs none /storage
|
||||
return
|
||||
fi
|
||||
|
||||
wakeonlan
|
||||
|
||||
if [ -n "$disk" ]; then
|
||||
|
Binary file not shown.
Before Width: | Height: | Size: 72 KiB |
@ -74,9 +74,6 @@ makeinstall_host() {
|
||||
cp bios/linux/syslinux $ROOT/$TOOLCHAIN/bin
|
||||
|
||||
mkdir -p $ROOT/$TOOLCHAIN/share/syslinux
|
||||
cp bios/com32/menu/vesamenu.c32 $ROOT/$TOOLCHAIN/share/syslinux
|
||||
cp bios/com32/lib/libcom32.c32 $ROOT/$TOOLCHAIN/share/syslinux
|
||||
cp bios/com32/libutil/libutil.c32 $ROOT/$TOOLCHAIN/share/syslinux
|
||||
cp bios/mbr/mbr.bin $ROOT/$TOOLCHAIN/share/syslinux
|
||||
cp bios/mbr/gptmbr.bin $ROOT/$TOOLCHAIN/share/syslinux
|
||||
cp efi64/efi/syslinux.efi $ROOT/$TOOLCHAIN/share/syslinux/bootx64.efi
|
||||
|
@ -111,44 +111,18 @@ if [ "$BOOTLOADER" = "syslinux" ]; then
|
||||
# create bootloader configuration
|
||||
echo "image: creating bootloader configuration..."
|
||||
cat << EOF > "$OE_TMP"/syslinux.cfg
|
||||
UI vesamenu.c32
|
||||
PROMPT 0
|
||||
MENU TITLE Boot Menu
|
||||
MENU BACKGROUND splash.png
|
||||
TIMEOUT 50
|
||||
SAY Press <TAB> to edit options
|
||||
DEFAULT installer
|
||||
|
||||
MENU WIDTH 70
|
||||
MENU MARGIN 15
|
||||
MENU ROWS 2
|
||||
MENU HSHIFT 4
|
||||
MENU VSHIFT 13
|
||||
MENU TIMEOUTROW 10
|
||||
MENU TABMSGROW 8
|
||||
MENU CMDLINEROW 8
|
||||
MENU HELPMSGROW 13
|
||||
MENU HELPMSGENDROW 26
|
||||
MENU CLEAR
|
||||
|
||||
MENU COLOR border 30;44 #40ffffff #00000000 std
|
||||
MENU COLOR title 1;36;44 #ff8bbfe3 #00000000 std
|
||||
MENU COLOR sel 7;37;40 #80f0f0f0 #ff606060 all
|
||||
MENU COLOR unsel 37;44 #50ffffff #00000000 std
|
||||
MENU COLOR help 37;40 #c0ffffff #a0000000 std
|
||||
MENU COLOR timeout_msg 37;40 #80ffffff #00000000 std
|
||||
MENU COLOR timeout 1;37;40 #c0ffffff #00000000 std
|
||||
MENU COLOR msg07 37;40 #90ffffff #a0000000 std
|
||||
MENU COLOR tabmsg 31;40 #ff868787 #00000000 std
|
||||
TIMEOUT 50
|
||||
PROMPT 1
|
||||
|
||||
LABEL installer
|
||||
MENU LABEL Run $DISTRONAME Installer
|
||||
KERNEL /$KERNEL_NAME
|
||||
APPEND boot=UUID=$UUID_SYSTEM installer quiet tty vga=current
|
||||
|
||||
LABEL live
|
||||
MENU LABEL Run $DISTRONAME Live
|
||||
KERNEL /$KERNEL_NAME
|
||||
APPEND boot=UUID=$UUID_SYSTEM disk=UUID=$UUID_STORAGE quiet vga=current
|
||||
APPEND boot=UUID=$UUID_SYSTEM live quiet tty vga=current
|
||||
EOF
|
||||
|
||||
# install extlinux
|
||||
@ -159,20 +133,10 @@ EOF
|
||||
echo "image: copying files to part1..."
|
||||
cp $TARGET_IMG/$IMAGE_NAME.kernel "$OE_TMP/$KERNEL_NAME"
|
||||
cp $TARGET_IMG/$IMAGE_NAME.system "$OE_TMP/SYSTEM"
|
||||
cp $RELEASE_DIR/splash.png "$OE_TMP"
|
||||
cp $ROOT/$TOOLCHAIN/share/syslinux/vesamenu.c32 "$OE_TMP"
|
||||
cp $ROOT/$TOOLCHAIN/share/syslinux/libcom32.c32 "$OE_TMP"
|
||||
cp $ROOT/$TOOLCHAIN/share/syslinux/libutil.c32 "$OE_TMP"
|
||||
mkdir -p "$OE_TMP/EFI/BOOT"
|
||||
cp $ROOT/$TOOLCHAIN/share/syslinux/bootx64.efi "$OE_TMP/EFI/BOOT"
|
||||
cp $ROOT/$TOOLCHAIN/share/syslinux/ldlinux.e64 "$OE_TMP/EFI/BOOT"
|
||||
cat << EOF > "$OE_TMP"/EFI/BOOT/syslinux.cfg
|
||||
DEFAULT installer
|
||||
|
||||
LABEL installer
|
||||
KERNEL /$KERNEL_NAME
|
||||
APPEND boot=UUID=$UUID_SYSTEM installer quiet tty vga=current
|
||||
EOF
|
||||
cp "$OE_TMP"/syslinux.cfg "$OE_TMP"/EFI/BOOT/syslinux.cfg
|
||||
elif [ "$BOOTLOADER" = "bcm2835-bootloader" ]; then
|
||||
# create bootloader configuration
|
||||
echo "image: creating bootloader configuration..."
|
||||
|
Loading…
x
Reference in New Issue
Block a user