Skip to content
Snippets Groups Projects
Commit f80c2721 authored by Jonas Höppner's avatar Jonas Höppner
Browse files

fng-install: Fix --partition-scheme change in FNGSystem install script

When switching from scheme 1 to 2, there was a bug leading to an
unformated partition.

Additionally I removed the partition message for FT2. This is only
used during the yocto installation and was in the wrong position
anyway.

(cherry picked from commit c0871d1e)
parent bb7173fa
No related branches found
No related tags found
2 merge requests!418Integrate gitlab-ci/fix-gitlab-ci-integration and 6 more,!396Pull changes from dunfell branch
......@@ -1922,7 +1922,11 @@ backup_config_partition()
#
# Preserce config partition content
if [ -d /etc/shared ];then
cp -r /etc/shared "$TMPDIR"
if [ $VERBOSE -ge 2 ];then
cp -r -v /etc/shared "$TMPDIR"
else
cp -r /etc/shared "$TMPDIR"
fi
fi
PART_CONFIG_OLD="$PART_CONFIG"
}
......
......@@ -244,7 +244,7 @@ if ! $REPARTITION_NEEDED;then
$PART_A_BOOT_OK || partition_error "Flash-N-Go system debug partition is not OK."
fi
if ! $REPARTITION_NEEDED && [ -n "$TARGET_PARTITION" ];then
if [ -n "$TARGET_PARTITION" ];then
get_partition_number TARGET_PARTITION_NO "$TARGET_PARTITION"
if [ "$TARGET_PARTITION_NO" -ge "$KEEP_PARTITIONS_CNT" ];then
# format if TARGET partition gets recreated
......@@ -253,8 +253,6 @@ if ! $REPARTITION_NEEDED;then
fi
fi
partitions_ready_message
#==================================================
# Check filesystem
#==================================================
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment