summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtem Bityutskiy <artem.bityutskiy@linux.intel.com>2013-06-26 15:12:11 +0300
committerArtem Bityutskiy <artem.bityutskiy@linux.intel.com>2013-06-26 15:12:11 +0300
commitbb509922a3a5125c622e34e2ebadc54beec2eb0f (patch)
treef24b1f8cbe3bae718b8f2298a6005067401e274d
parent2bd6189575c2687287fdf584061f7d7ab35d5f41 (diff)
downloadsetup-efi-ivi-bb509922a3a5125c622e34e2ebadc54beec2eb0f.tar.gz
setup-efi-ivi-bb509922a3a5125c622e34e2ebadc54beec2eb0f.tar.bz2
setup-efi-ivi-bb509922a3a5125c622e34e2ebadc54beec2eb0f.zip
setup-efi-ivi: add a missing white-space in loader.conf
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
-rwxr-xr-xsetup-efi-ivi2
-rwxr-xr-xsetup-gummiboot-conf37
2 files changed, 38 insertions, 1 deletions
diff --git a/setup-efi-ivi b/setup-efi-ivi
index 7860497..2099a6a 100755
--- a/setup-efi-ivi
+++ b/setup-efi-ivi
@@ -88,7 +88,7 @@ printf "%s\n" "$kernels" | while IFS= read -r kernel; do
cat > "$esp/loader/entries/$kernel.conf" <<-EOF
title Tizen IVI 3.0
version $kernel_version
- efi/$kernel
+ efi /$kernel
options $INSTALLERFW_KERNEL_OPTS root=PARTUUID=$root_partuuid
EOF
done
diff --git a/setup-gummiboot-conf b/setup-gummiboot-conf
index fb21f8b..46c0f32 100755
--- a/setup-gummiboot-conf
+++ b/setup-gummiboot-conf
@@ -35,6 +35,43 @@ fatal()
exit 1
}
+#
+# Parse the input parameters
+#
+TEMP=`getopt -n $PROG --long default-kernel:,verbose,help -- "$@"` ||
+ fail_usage ""
+eval set -- "$TEMP"
+
+verbose=
+default_kernel=
+
+while true; do
+ case "$1" in
+ -w|--workdir)
+ mkdir $verbose -p -- "$2" >&2
+ tmpdir="$(mktemp --tmpdir="$(readlink -fv -- "$2")" -dt "$PROG.XXXX")"
+ shift
+ ;;
+ -p|--preserve)
+ preserve="--preserve"
+ ;;
+ -v|--verbose) verbose=-v
+ ;;
+ -h|--help)
+ show_usage
+ exit 0
+ ;;
+ --) shift; break
+ ;;
+ *) fail_usage "Unrecognized option: $1"
+ ;;
+ esac
+ shift
+done
+
+[ "$#" = 3 ] || fatal 'Insufficient or too many arguments.'
+
+
# Make sure the installer framework variables are defined
[ "${INSTALLERFW_MOUNT_PREFIX:+x}" == "x" ] ||
fatal "installer framework environment variables not found"