Skip to content

Commit 50d83ed

Browse files
committed
fix compatibility issue with older Recovery notifications
Signed-off-by: Michel-FK <michel.stempin@funkey-project.com>
1 parent 8ba4b07 commit 50d83ed

1 file changed

Lines changed: 16 additions & 11 deletions

File tree

FunKey/board/funkey/update_partition

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,14 @@ root_part_num=2
77
root_part=/dev/mmcblk0p${root_part_num}
88
root_mount=/tmp/rootfs
99

10+
# Compatibility issue with older Recovery notifications
11+
if [ -x /usr/local/sbin/notif ]; then
12+
alias notif_set="notif set"
13+
fi
14+
1015
do_preinst()
1116
{
12-
notif set 0 " 1/4 EXTRACT FIRMWARE UPDATE..^DO NOT TURN OFF THE CONSOLE"
17+
notif_set 0 " 1/4 EXTRACT FIRMWARE UPDATE..^DO NOT TURN OFF THE CONSOLE"
1318
exit 0
1419
}
1520

@@ -19,24 +24,24 @@ do_postinst()
1924
#################
2025
# Resize Rootfs #
2126
#################
22-
notif set 0 " 2/4 RESIZE ROOT FILESYSTEM^DO NOT TURN OFF THE CONSOLE"
27+
notif_set 0 " 2/4 RESIZE ROOT FILESYSTEM^DO NOT TURN OFF THE CONSOLE"
2328
resize2fs ${root_part}
2429
if [ $? -ne 0 ]; then
25-
notif set 0 " CANNOT RESIZE ROOT^FILESYSTEM"
26-
exit 1
30+
notif_set 0 " CANNOT RESIZE ROOT^FILESYSTEM"
31+
exit 1
2732
fi
2833

2934
##############################
3035
# SHARED PARTITION PROCESSES #
3136
##############################
32-
notif set 0 " 3/4 COPY OPKS TO USB MOUNT^DO NOT TURN OFF THE CONSOLE"
37+
notif_set 0 " 3/4 COPY OPKS TO USB MOUNT^DO NOT TURN OFF THE CONSOLE"
3338

3439
# Mount Rootfs
3540
mkdir -p ${root_mount}
3641
mount -t ext4 ${root_part} ${root_mount}
3742
if [ $? -ne 0 ]; then
38-
notif set 0 "CANNOT MOUNT ROOT^FILESYSTEM"
39-
exit 1
43+
notif_set 0 "CANNOT MOUNT ROOT^FILESYSTEM"
44+
exit 1
4045
fi
4146

4247
# Copy OPKs
@@ -48,8 +53,8 @@ do_postinst()
4853
# Unmount Rootfs
4954
umount ${root_mount}
5055
if [ $? -ne 0 ]; then
51-
notif set 0 "CANNOT UNMOUNT ROOT^FILESYSTEM"
52-
exit 1
56+
notif_set 0 "CANNOT UNMOUNT ROOT^FILESYSTEM"
57+
exit 1
5358
fi
5459

5560
# Change FunKey config files extension from .cfg to .fkcfg
@@ -66,8 +71,8 @@ do_postinst()
6671
# Erase update file #
6772
#####################
6873
for file in $(ls /mnt/FunKey-*.fwu); do
69-
notif set 0 " 4/4 ERASE UPDATE FILE^DO NOT TURN OFF THE CONSOLE"
70-
rm -f "${file}"
74+
notif_set 0 " 4/4 ERASE UPDATE FILE^DO NOT TURN OFF THE CONSOLE"
75+
rm -f "${file}"
7176
done
7277
exit 0
7378
}

0 commit comments

Comments
 (0)