Commit 012911c2 authored by Manuel's avatar Manuel

Fix script

parent 6962013a
......@@ -5,14 +5,14 @@
pkgname=chakra-init-live
pkgver=2013.02
pkgrel=2
pkgrel=3
pkgdesc="Live-session systemd startup scripts"
arch=('x86_64')
url="http://www.chakra-project.org"
license=('GPL2')
source=('live' 'locale_setup.sh')
md5sums=('e757dbe814a219709d616c146a7c26a9'
'5c0d0898f7c1ab14adc0a4ade110fc0b')
'37063a53100517067bb1e14d1db90171')
package() {
cd ${srcdir}
......
......@@ -25,7 +25,7 @@ get_keyboard() {
echo $KEYBOARD
}
get_layout {
get_layout() {
local LAYOUT=$(get_bootparam_value layout)
echo $LAYOUT
}
......
......@@ -22,7 +22,6 @@ makedepends=('xz' 'bdf-unifont' 'ttf-dejavu' 'python' 'autogen'
source=("ftp://ftp.gnu.org/gnu/grub/grub-${pkgver}.tar.xz"
'chakra_grub2_fixes.patch'
'quote-strings-in-grub.cfg.patch'
'grub.default'
'update-grub')
md5sums=('a1043102fbc7bcedbf53e7ee3d17ab91'
......
=== modified file 'util/grub.d/10_kfreebsd.in'
--- util/grub.d/10_kfreebsd.in 2012-09-18 11:04:06 +0000
+++ util/grub.d/10_kfreebsd.in 2012-11-19 19:55:17 +0000
@@ -98,7 +98,7 @@
fi
printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
- message="$(gettext_printf "Loading kernel of FreeBSD %s ..." ${version})"
+ message="$(gettext_printf "Loading kernel of FreeBSD %s ..." ${version} | grub_quote)"
sed "s/^/$submenu_indentation/" << EOF
echo '$(echo "$message" | grub_quote)'
kfreebsd ${rel_dirname}/${basename} ${args}
=== modified file 'util/grub.d/20_linux_xen.in'
--- util/grub.d/20_linux_xen.in 2012-09-18 11:04:06 +0000
+++ util/grub.d/20_linux_xen.in 2012-11-19 19:55:17 +0000
@@ -117,8 +117,8 @@
prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | grub_add_tab)"
fi
printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
- xmessage="$(gettext_printf "Loading Xen %s ..." ${xen_version})"
- lmessage="$(gettext_printf "Loading Linux %s ..." ${version})"
+ xmessage="$(gettext_printf "Loading Xen %s ..." ${xen_version} | grub_quote)"
+ lmessage="$(gettext_printf "Loading Linux %s ..." ${version} | grub_quote)"
sed "s/^/$submenu_indentation/" << EOF
echo '$(echo "$xmessage" | grub_quote)'
multiboot ${rel_xen_dirname}/${xen_basename} placeholder ${xen_args}
@@ -127,7 +127,7 @@
EOF
if test -n "${initrd}" ; then
# TRANSLATORS: ramdisk isn't identifier. Should be translated.
- message="$(gettext_printf "Loading initial ramdisk ...")"
+ message="$(gettext_printf "Loading initial ramdisk ..." | grub_quote)"
sed "s/^/$submenu_indentation/" << EOF
echo '$(echo "$message" | grub_quote)'
module ${rel_dirname}/${initrd}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment