jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 13:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

busybox-initramfs: fix init script

Browse Source 
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2011-09-12 19:56:55 +02:00
parent 6f92ac534d
commit 3f879ab8d1
1 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
packages/initramfs/sysutils/busybox-initramfs/scripts/init
View File

@ -172,15 +172,8 @@ NFS_OVERLAY="192.168.1.1:/var/lib/overlay"
[ ! -e /sysroot/sbin/init ] && /bin/busybox usleep 1000000 [ ! -e /sysroot/sbin/init ] && /bin/busybox usleep 1000000
<<<<<<< HEAD
[ ${retry_nr} -gt 0 ] [ ${retry_nr} -gt 0 ]
done done
=======
if [ -n "$disk" ]; then
mount_part "$disk" "/storage" "rw,noatime"
update "Kernel" "$IMAGE_KERNEL" "/flash/$IMAGE_KERNEL"
update "System" "$IMAGE_SYSTEM" "/flash/$IMAGE_SYSTEM"
>>>>>>> 32562d4fa964979f0879f096451a8bbc20b9f7d9
if [ ! -e /sysroot/sbin/init ]; then if [ ! -e /sysroot/sbin/init ]; then
error "INIT_2" "Could not mount NBD root from $NBD_ROOT_SERVER port $NBD_ROOT_PORT" error "INIT_2" "Could not mount NBD root from $NBD_ROOT_SERVER port $NBD_ROOT_PORT"
@ -217,8 +210,6 @@ NFS_OVERLAY="192.168.1.1:/var/lib/overlay"
update "Kernel" "$IMAGE_KERNEL" "/flash/$IMAGE_KERNEL" update "Kernel" "$IMAGE_KERNEL" "/flash/$IMAGE_KERNEL"
update "System" "$IMAGE_SYSTEM" "/flash/$IMAGE_SYSTEM" update "System" "$IMAGE_SYSTEM" "/flash/$IMAGE_SYSTEM"
umount /storage
if test "$REBOOT" -eq "1"; then if test "$REBOOT" -eq "1"; then
echo "System reboots now..." && \ echo "System reboots now..." && \
/bin/busybox reboot /bin/busybox reboot
@ -235,6 +226,10 @@ NFS_OVERLAY="192.168.1.1:/var/lib/overlay"
# 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
if [ -n "$disk" ]; then
/bin/busybox mount --move /storage /sysroot/storage
fi
} }
if [ -z "$NETBOOT" ]; then if [ -z "$NETBOOT" ]; then
@ -243,17 +238,7 @@ NFS_OVERLAY="192.168.1.1:/var/lib/overlay"
mount_nbd mount_nbd
fi fi
<<<<<<< HEAD # unmount all other filesystems
=======
# move /flash and /storage to /sysroot
/bin/busybox mount --move /flash /sysroot/flash
if [ -n "$disk" ]; then
/bin/busybox mount --move /storage /sysroot/storage
fi
>>>>>>> 32562d4fa964979f0879f096451a8bbc20b9f7d9
# unmount all other filesystems
/bin/busybox umount /dev /bin/busybox umount /dev
/bin/busybox umount /proc /bin/busybox umount /proc
/bin/busybox umount /sys /bin/busybox umount /sys