Consistenly using 'true' instead of 'Yes' or 'yes' when using booleans.

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

diff --git a/scripts/boot/misc-helpers.sh b/scripts/boot/misc-helpers.sh
index fe45ee1..856a023 100755 (executable)
--- a/scripts/boot/misc-helpers.sh
+++ b/scripts/boot/misc-helpers.sh
@@ -2,6 +2,21 @@
 
 #set -e
 
+really_export ()
+{
+       STRING="${1}"
+       VALUE="$(eval echo -n \${$STRING})"
+
+       if [ -f /live.vars ] && grep -sq "export ${STRING}" /live.vars
+       then
+               sed -i -e 's/\('${STRING}'=\).*$/\1'${VALUE}'/' /live.vars
+       else
+               echo "export ${STRING}=\"${VALUE}\"" >> /live.vars
+       fi
+
+       eval export "${STRING}"="${VALUE}"
+}
+
 is_in_list_separator_helper () {
        local sep=${1}
        shift
@@ -697,16 +712,16 @@ removable_dev ()
                then
                        if [ -z "${want_usb}" ]
                        then
-                               dev_ok="yes"
+                               dev_ok="true"
                        else
                                if readlink ${sysblock} | grep -q usb
                                then
-                                       dev_ok="yes"
+                                       dev_ok="true"
                                fi
                        fi
                fi
 
-               if [ "${dev_ok}" = "yes" ]
+               if [ "${dev_ok}" = "true" ]
                then
                        case "${output_format}" in
                                sys)
@@ -925,7 +940,7 @@ get_custom_mounts ()
                                                opt_source=${opt#source=}
                                                ;;
                                        link)
-                                               opt_link="yes"
+                                               opt_link="true"
                                                ;;
                                        union|bind)
                                                ;;
@@ -993,22 +1008,22 @@ activate_custom_mounts ()
 
        while read device source dest options # < ${custom_mounts}
        do
-               local opt_bind="yes"
+               local opt_bind="true"
                local opt_link=""
                local opt_union=""
                for opt in $(echo ${options} | tr ',' ' ');
                do
                        case "${opt}" in
                                bind)
-                                       opt_bind="yes"
+                                       opt_bind="true"
                                        unset opt_link opt_union
                                        ;;
                                link)
-                                       opt_link="yes"
+                                       opt_link="true"
                                        unset opt_bind opt_union
                                        ;;
                                union)
-                                       opt_union="yes"
+                                       opt_union="true"
                                        unset opt_bind opt_link
                                        ;;
                        esac