From a3e8e384b200337373942ca986429099080658ef Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Tue, 2 Aug 2022 10:55:06 +0200 Subject: liveinit: use 'persistence' instead of ${PERSISTENCE} here Because the used $PERSISTENCE value can have a pathname component, and the custom naming does not add value anyway. --- liveinit.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/liveinit.tpl b/liveinit.tpl index eb86e0c..81f0368 100644 --- a/liveinit.tpl +++ b/liveinit.tpl @@ -1010,7 +1010,7 @@ if [ "$RESCUE" = "" ]; then elif [ "${PERSISTPART}" = "scandev" ]; then # Scan partitions to find the one with the persistence directory: echo "${MARKER}: Scanning for partition with '${PERSISTENCE}'..." - ppartdir=".${PERSISTENCE}_$(od -An -N1 -tu1 /dev/urandom|tr -d ' ')" + ppartdir=".persistence_$(od -An -N1 -tu1 /dev/urandom|tr -d ' ')" mkdir -p /mnt/live/${ppartdir} for PPART in $(ret_partition $(blkid |cut -d: -f1)) ; do PPARTFS=$(blkid $PPART |rev |cut -d'"' -f2 |rev) @@ -1052,7 +1052,7 @@ if [ "$RESCUE" = "" ]; then REALPP=$(readlink -f ${PERSISTPART}) if [ "${REALMP}" != "${REALPP}" ]; then # Mount the partition readonly to access the persistence directory: - ppdir=".${PERSISTENCE}_$(od -An -N1 -tu1 /dev/urandom|tr -d ' ')" + ppdir=".persistence_$(od -An -N1 -tu1 /dev/urandom|tr -d ' ')" mkdir -p /mnt/live/${ppdir} mount -o ro ${PERSISTPART} /mnt/live/${ppdir} if [ $? -ne 0 ]; then -- cgit v1.2.3