From 834ff2fe4f2e80facccd4dcec6bcd1c31398388f Mon Sep 17 00:00:00 2001 From: John Crispin Date: Wed, 23 Feb 2022 07:54:22 +0100 Subject: [PATCH] certificates: improve the code loading sqsh certificates Signed-off-by: John Crispin --- .../tip/certificates/files/etc/init.d/certificates | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/feeds/tip/certificates/files/etc/init.d/certificates b/feeds/tip/certificates/files/etc/init.d/certificates index fd179d268..e47270bab 100755 --- a/feeds/tip/certificates/files/etc/init.d/certificates +++ b/feeds/tip/certificates/files/etc/init.d/certificates @@ -7,12 +7,15 @@ boot() { . /lib/functions.sh mkdir -p /certificates /etc/ucentral/ local mtd=$(find_mtd_index certificates) - [ -n "$mtd" -a -f /sys/class/mtd/mtd$mtd/oobsize ] && ubiattach -p /dev/mtd$mtd - if [ -n "$(ubinfo -a | grep certificates)" ]; then - [ -e /dev/ubi0 ] && mount -t ubifs ubi0:certificates /certificates - [ -e /dev/ubi1 ] && mount -t ubifs ubi1:certificates /certificates - else + + if [ "$(head -c 4 /dev/mtd$mtd)" == "hsqs" ]; then mount -t squashfs /dev/mtdblock$mtd /certificates + else + [ -n "$mtd" -a -f /sys/class/mtd/mtd$mtd/oobsize ] && ubiattach -p /dev/mtd$mtd + if [ -n "$(ubinfo -a | grep certificates)" ]; then + [ -e /dev/ubi0 ] && mount -t ubifs ubi0:certificates /certificates + [ -e /dev/ubi1 ] && mount -t ubifs ubi1:certificates /certificates + fi fi [ -f /certificates/dev-id ] && { cp /certificates/*.pem /etc/ucentral/