diff options
| author | Tails developers <amnesia@boum.org> | 2012-12-07 22:29:15 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-12-07 22:29:15 +0100 |
| commit | c32e1b2f0f8cbf4a11d198824f463cf7f7455a76 (patch) | |
| tree | aae3a26fc923a5f65af0f814c32173352bb4960a | |
| parent | 77dab1cb394c5fc2b9a848c6297d24f65a3b8259 (diff) | |
| download | live-boot-c32e1b2f0f8cbf4a11d198824f463cf7f7455a76.tar.gz live-boot-c32e1b2f0f8cbf4a11d198824f463cf7f7455a76.zip | |
Handling already mounted persistence backing media correctly.
I.e. treat the case where a backing media already had been mounted in
the expected place like a success (by printing the mount dir). This
doesn't fix any bug in live-boot, but it will come in handy for the
(soon-to-come) script for activating custom persistence in user-space.
While we're at it, document this function.
| -rwxr-xr-x | scripts/boot/9990-misc-helpers.sh | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/scripts/boot/9990-misc-helpers.sh b/scripts/boot/9990-misc-helpers.sh index 06a80f8..94c48e6 100755 --- a/scripts/boot/9990-misc-helpers.sh +++ b/scripts/boot/9990-misc-helpers.sh @@ -723,6 +723,11 @@ try_mount () fi } +# Try to mount $device to the place expected by live-boot. If $device +# is already mounted somewhere, move it to the expected place. If +# we're only probing $device (to check if it has custom persistence) +# $probe should be set, which suppresses warnings upon failure. On +# success, print the mount point for $device. mount_persistence_media () { local device=${1} @@ -760,8 +765,12 @@ mount_persistence_media () rmdir "${backing}" return 1 fi + else + # This means that $device has already been mounted on + # the place expected by live-boot, so we're done. + echo ${backing} + return 0 fi - return 0 } close_persistence_media () |