Adding support for the findiso boot parameter (Closes: #656135).

[live-boot-grml.git] / scripts / live-helpers

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 40058e9..456c2d7 100644 (file)
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -22,7 +22,7 @@ custom_overlay_label="custom-ov"
 root_snapshot_label="live-sn"
 old_root_snapshot_label="live-sn"
 home_snapshot_label="home-sn"
-persistence_list="live.persist"
+persistence_list="live-persistence.conf"
 
 Arguments ()
 {
@@ -143,6 +143,11 @@ Arguments ()
                                export STATICIP
                                ;;
 
+                       findiso=*)
+                               FINDISO="${ARGUMENT#findiso=}"
+                               export FINDISO
+                               ;;
+
                        live-getty)
                                LIVE_GETTY="1"
                                export LIVE_GETTY
@@ -1261,7 +1266,7 @@ do_union ()
 
 get_custom_mounts ()
 {
-       # Side-effect: leaves $devices with live.persist mounted in ${rootmnt}/live/persistence
+       # Side-effect: leaves $devices with live-persistence.conf mounted in ${rootmnt}/live/persistence
        # Side-effect: prints info to file $custom_mounts
 
        local custom_mounts=${1}
@@ -1579,3 +1584,15 @@ fix_home_rw_compatibility ()
 /home source=." > "${include_list}"
        fi
 }
+
+is_mountpoint () {
+
+       directory="$1"
+
+       if [ $(stat -fc%d:%D "${directory}") != $(stat -fc%d:%D "${directory}/..") ]
+       then
+               return 0
+       else
+               return 1
+       fi
+}