mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-08-01 23:17:50 +00:00
busybox-initramfs: dont build an seperate installer image to simplyfing the build - part 2
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
parent
05908655f1
commit
816d453095
@ -3,7 +3,6 @@
|
|||||||
UPDATE_DIR=/storage/.update
|
UPDATE_DIR=/storage/.update
|
||||||
|
|
||||||
IMAGE_SYSTEM="SYSTEM"
|
IMAGE_SYSTEM="SYSTEM"
|
||||||
IMAGE_INSTALLER="INSTALLER"
|
|
||||||
IMAGE_KERNEL="KERNEL"
|
IMAGE_KERNEL="KERNEL"
|
||||||
REBOOT=0
|
REBOOT=0
|
||||||
|
|
||||||
@ -26,18 +25,9 @@ REBOOT=0
|
|||||||
fastboot)
|
fastboot)
|
||||||
FASTBOOT=yes
|
FASTBOOT=yes
|
||||||
;;
|
;;
|
||||||
installer)
|
|
||||||
INSTALLER=yes
|
|
||||||
;;
|
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
if [ ! "$INSTALLER" = "yes" ]; then
|
|
||||||
IMAGE="$IMAGE_SYSTEM"
|
|
||||||
else
|
|
||||||
IMAGE="$IMAGE_INSTALLER"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "$FASTBOOT" = yes; then
|
if test "$FASTBOOT" = yes; then
|
||||||
IONICE="/bin/busybox ionice -c 1 -n 0"
|
IONICE="/bin/busybox ionice -c 1 -n 0"
|
||||||
fi
|
fi
|
||||||
@ -92,21 +82,17 @@ REBOOT=0
|
|||||||
show_splash
|
show_splash
|
||||||
|
|
||||||
mount_part "$boot" "/flash" "ro,noatime"
|
mount_part "$boot" "/flash" "ro,noatime"
|
||||||
|
mount_part "$disk" "/storage" "rw,noatime"
|
||||||
|
update "Kernel" "$IMAGE_KERNEL" "/flash/$IMAGE_KERNEL"
|
||||||
|
update "System" "$IMAGE_SYSTEM" "/flash/$IMAGE_SYSTEM"
|
||||||
|
|
||||||
if [ ! "$INSTALLER" = "yes" ]; then
|
if test "$REBOOT" -eq 1; then
|
||||||
mount_part "$disk" "/storage" "rw,noatime"
|
echo "System reboots now..." && \
|
||||||
update "Kernel" "$IMAGE_KERNEL" "/flash/$IMAGE_KERNEL"
|
/bin/busybox reboot
|
||||||
update "System" "$IMAGE_SYSTEM" "/flash/$IMAGE_SYSTEM"
|
|
||||||
update "Installer" "$IMAGE_INSTALLER" "/flash/$IMAGE_INSTALLER"
|
|
||||||
|
|
||||||
if test "$REBOOT" -eq 1; then
|
|
||||||
echo "System reboots now..." && \
|
|
||||||
/bin/busybox reboot
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -f "/flash/$IMAGE" ]; then
|
if [ -f "/flash/$IMAGE_SYSTEM" ]; then
|
||||||
mount_part "/flash/$IMAGE" "/sysroot" "loop"
|
mount_part "/flash/$IMAGE_SYSTEM" "/sysroot" "loop"
|
||||||
[ $ERR_ENV -ne 0 ] && debug_shell
|
[ $ERR_ENV -ne 0 ] && debug_shell
|
||||||
else
|
else
|
||||||
error "INIT_2" "Could not find system."
|
error "INIT_2" "Could not find system."
|
||||||
@ -115,10 +101,7 @@ REBOOT=0
|
|||||||
|
|
||||||
# move /flash and /storage to /sysroot
|
# move /flash and /storage to /sysroot
|
||||||
/bin/busybox mount --move /flash /sysroot/flash
|
/bin/busybox mount --move /flash /sysroot/flash
|
||||||
|
/bin/busybox mount --move /storage /sysroot/storage
|
||||||
if [ ! "$INSTALLER" = "yes" ]; then
|
|
||||||
/bin/busybox mount --move /storage /sysroot/storage
|
|
||||||
fi
|
|
||||||
|
|
||||||
# unmount all other filesystems
|
# unmount all other filesystems
|
||||||
/bin/busybox umount /dev
|
/bin/busybox umount /dev
|
||||||
|
Loading…
x
Reference in New Issue
Block a user