From 4fe3c74f01f235ffff782cee513db638c8de2375 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 24 Jun 2013 22:03:20 +0200 Subject: [PATCH] Replacing variable used in one place only with explicit directory for simplicity. --- components/9990-aaa-fixme.sh | 2 +- components/9990-misc-helpers.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/9990-aaa-fixme.sh b/components/9990-aaa-fixme.sh index 9696c74..a8fc6e8 100755 --- a/components/9990-aaa-fixme.sh +++ b/components/9990-aaa-fixme.sh @@ -13,7 +13,7 @@ LIVE_MEDIA_PATH="live" HOSTNAME="host" mkdir -p "${mountpoint}" -tried="/tmp/tried" +mkdir -p /var/lib/live/boot # Create /etc/mtab for debug purpose and future syncs mkdir -p /etc diff --git a/components/9990-misc-helpers.sh b/components/9990-misc-helpers.sh index 9312381..7cb2762 100755 --- a/components/9990-misc-helpers.sh +++ b/components/9990-misc-helpers.sh @@ -199,9 +199,9 @@ check_dev () if is_supported_fs ${fstype} then devuid=$(blkid -o value -s UUID "$devname") - [ -n "$devuid" ] && grep -qs "\<$devuid\>" $tried && continue + [ -n "$devuid" ] && grep -qs "\<$devuid\>" /var/lib/live/boot/devices-already-tried-to-mount && continue mount -t ${fstype} -o ro,noatime "${devname}" ${mountpoint} || continue - [ -n "$devuid" ] && echo "$devuid" >> $tried + [ -n "$devuid" ] && echo "$devuid" >> /var/lib/live/boot/devices-already-tried-to-mount if [ -n "${FINDISO}" ] then -- 2.1.4