summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2022-08-02 10:55:06 +0200
committer Eric Hameleers <alien@slackware.com>2022-08-02 10:55:06 +0200
commita3e8e384b200337373942ca986429099080658ef (patch)
treec31b47bdf70f1b8200e61a5ea67f2b09ce536ce6
parentfc3b72eddc9897715cfb71817354f0d47046eac0 (diff)
downloadliveslak-master.tar.gz
liveslak-master.tar.xz
liveinit: use 'persistence' instead of ${PERSISTENCE} hereHEADmaster
Because the used $PERSISTENCE value can have a pathname component, and the custom naming does not add value anyway.
-rw-r--r--liveinit.tpl4
1 files 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