diff --git a/files/board/arpl/overlayfs/opt/arpl/boot.sh b/files/board/arpl/overlayfs/opt/arpl/boot.sh index f06c01f2..2e82e91d 100755 --- a/files/board/arpl/overlayfs/opt/arpl/boot.sh +++ b/files/board/arpl/overlayfs/opt/arpl/boot.sh @@ -76,7 +76,8 @@ EFI_BUG="`readModelKey "${MODEL}" "builds.${BUILD}.efi-bug"`" LOADER_DISK="`blkid | grep 'LABEL="ARPL3"' | cut -d3 -f1`" BUS=`udevadm info --query property --name ${LOADER_DISK} | grep ID_BUS | cut -d= -f2` if [ "${BUS}" = "ata" ]; then - SIZE=$((`df -BM | awk '/\/mnt\/p3/{print$2}' | tr 'M' ' '`+300)) + LOADER_DEVICE_NAME=`echo ${LOADER_DISK} | sed 's|/dev/||'` + SIZE=$((`cat /sys/block/${LOADER_DEVICE_NAME}/size`/2048+10)) # Read SATADoM type DOM="`readModelKey "${MODEL}" "dom"`" fi diff --git a/files/board/arpl/overlayfs/opt/arpl/init.sh b/files/board/arpl/overlayfs/opt/arpl/init.sh index 94162708..3f1a3bea 100755 --- a/files/board/arpl/overlayfs/opt/arpl/init.sh +++ b/files/board/arpl/overlayfs/opt/arpl/init.sh @@ -34,7 +34,6 @@ mount ${LOADER_DISK}1 ${BOOTLOADER_PATH} || die "Can't mount ${BOOTLOADER_PATH}" mount ${LOADER_DISK}2 ${SLPART_PATH} || die "Can't mount ${SLPART_PATH}" mount ${LOADER_DISK}3 ${CACHE_PATH} || die "Can't mount ${CACHE_PATH}" -mkdir -p "${ADDONS_PATH}" # Move/link SSH machine keys to/from cache volume [ ! -d "${CACHE_PATH}/ssh" ] && cp -R "/etc/ssh" "${CACHE_PATH}/ssh" rm -rf "/etc/ssh" @@ -156,3 +155,7 @@ echo echo -e "User config is on \033[1;32m${USER_CONFIG_FILE}\033[0m" echo -e "Default SSH Root password is \033[1;31mRedp1lL-1s-4weSomE\033[0m" echo + +mkdir -p "${ADDONS_PATH}" +mkdir -p "${LKM_PATH}" +mkdir -p "${MODULES_PATH}" diff --git a/files/board/arpl/overlayfs/opt/arpl/menu.sh b/files/board/arpl/overlayfs/opt/arpl/menu.sh index 996d9a45..4597afff 100755 --- a/files/board/arpl/overlayfs/opt/arpl/menu.sh +++ b/files/board/arpl/overlayfs/opt/arpl/menu.sh @@ -803,12 +803,11 @@ function updateMenu() { unzip /tmp/addons.zip -d /tmp/addons >/dev/null 2>&1 dialog --backtitle "`backtitle`" --title "Update addons" --aspect 18 \ --infobox "Installing new addons" 0 0 - DEST_PATH="/mnt/p3/addons" for PKG in `ls /tmp/addons/*.addon`; do ADDON=`basename ${PKG} | sed 's|.addon||'` - rm -rf "${DEST_PATH}/${ADDON}" - mkdir -p "${DEST_PATH}/${ADDON}" - tar xaf "${PKG}" -C "${DEST_PATH}/${ADDON}" >/dev/null 2>&1 + rm -rf "${ADDONS_PATH}/${ADDON}" + mkdir -p "${ADDONS_PATH}/${ADDON}" + tar xaf "${PKG}" -C "${ADDONS_PATH}/${ADDON}" >/dev/null 2>&1 done DIRTY=1 dialog --backtitle "`backtitle`" --title "Update addons" --aspect 18 \ diff --git a/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh b/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh index cb46fbdb..08480912 100755 --- a/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh +++ b/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh @@ -115,7 +115,6 @@ ADDONS['eudev']="" echo -n "." mkdir -p "${RAMDISK_PATH}/addons" echo "#!/bin/sh" > "${RAMDISK_PATH}/addons/addons.sh" -echo 'export INSMOD="/sbin/insmod"' >> "${RAMDISK_PATH}/addons/addons.sh" echo 'echo "addons.sh called with params ${@}"' >> "${RAMDISK_PATH}/addons/addons.sh" for ADDON in ${!ADDONS[@]}; do PARAMS=${ADDONS[${ADDON}]}