El 08/04/12 13:29, Daniel Baumann escribió:
On 04/08/2012 12:50 PM, adrian15 wrote:I rewrote the patch with your pieces of advice implemented.looks good to me, thanks for you patience with it. intrigeri, ack for applying it?
This is another patch that would complement the first one.It includes reducing the is_mountpoint function and making sure that the filesystem is not cluttered with unused mountpoint directorios (findiso in this specific case).
adrian15 --Support free software. Donate to Super Grub Disk. Apoya el software libre. Dona a Super Grub Disk. http://www.supergrubdisk.org/donate/
diff --git a/scripts/live b/scripts/live
index 77ca9d1..b7ab159 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1675,6 +1675,7 @@ mountroot ()
if is_mountpoint /live/findiso
then
umount /root/live/findiso
+ rmdir --ignore-fail-on-non-empty /root/live/findiso > /dev/null 2>&1 || true
fi
fi
diff --git a/scripts/live-helpers b/scripts/live-helpers
index 2c943f1..d8e1ca3 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -1589,10 +1589,6 @@ is_mountpoint () {
directory="$1"
- if [ $(stat -fc%d:%D "${directory}") != $(stat -fc%d:%D "${directory}/..") ]
- then
- return 0
- else
- return 1
- fi
+ [ $(stat -fc%d:%D "${directory}") != $(stat -fc%d:%D "${directory}/..") ]
+
}