Attachment #228117 for bug #315449

Lines 25-31 Link Here

(-)grub-1.98.orig/include/grub/i18n.h (-1 / +1 lines)
25	extern const char (EXPORT_VAR(grub_gettext)) (const char *s);	25	extern const char (EXPORT_VAR(grub_gettext)) (const char *s);
26		26
27	/* NLS can be disabled through the configure --disable-nls option. */	27	/* NLS can be disabled through the configure --disable-nls option. */
28	#if ENABLE_NLS	28	#ifdef ENABLE_NLS
29		29
30	# ifdef GRUB_UTIL	30	# ifdef GRUB_UTIL
31		31




	  dest="`echo $$file | sed 's,.*/,,'`"; \
	  $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(libdir)/grub/$$dest; \
	done
	@langs='$(LINGUAS)'; \
	for lang in $$langs; do \
	  $(SHELL) $(mkinstalldirs) $(DESTDIR)/$(datadir)/locale/$$lang/LC_MESSAGES; \
	  file="po/$$lang.mo"; \
	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
	  $(INSTALL_DATA) $$dir$$file $(DESTDIR)/$(datadir)/locale/$$lang/LC_MESSAGES/$(PACKAGE).mo; \
	done
	$(SHELL) $(mkinstalldirs) $(DESTDIR)$(infodir)
	@list='$(info_INFOS)'; \
	for file in $$list; do \




  ;;
esac

# Gettext variables and module
if [ "x${LANG}" != "xC" ] ; then
    prepare_grub_to_access_device $(${grub_probe} --target=device ${locale_dir})
  cat << EOF
set locale_dir=(\$root)$(make_system_path_relative_to_its_root ${locale_dir})
set lang=${grub_lang}
insmod gettext
EOF
fi

if [ "x${GRUB_HIDDEN_TIMEOUT}" != "x" ] ; then
  if [ "x${GRUB_HIDDEN_TIMEOUT_QUIET}" = "xtrue" ] ; then
    verbose=




EOF
prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/"
cat << EOF
	echo		"Loading GNU Mach ..."
	multiboot	${kernel} root=device:${GRUB_DEVICE#/dev/}
EOF
save_default_entry | sed -e "s/^/\t/"
prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e "s/^/\t/"
cat << EOF
	echo		"Loading the Hurd ..."
	module		/hurd/${hurd_fs}.static ${hurd_fs} --readonly \\
			--multiboot-command-line='\${kernel-command-line}' \\
			--host-priv-port='\${host-port}' \\

EOF
prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/"
cat << EOF
	echo		"Loading GNU Mach ..."
	multiboot	${kernel} root=device:${GRUB_DEVICE#/dev/} -s
EOF
save_default_entry | sed -e "s/^/\t/"
prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e "s/^/\t/"
cat << EOF
	echo		"Loading the Hurd ..."
	module		/hurd/${hurd_fs}.static ${hurd_fs} \\
			--multiboot-command-line='\${kernel-command-line}' \\
			--host-priv-port='\${host-port}' \\

Lines 44-50 Link Here

(-)grub-1.98.orig/util/grub.d/10_kfreebsd.in (-2 / +2 lines)
44	version="$2"	44	version="$2"
45	recovery="$3" # not used yet	45	recovery="$3" # not used yet
46	args="$4" # not used yet	46	args="$4" # not used yet
47	title="$(gettext "%s, with kFreeBSD %s")"	47	title="%s, with kFreeBSD %s"
48	printf "menuentry \"${title}\" ${CLASS} {\n" "${os}" "${version}"	48	printf "menuentry \"${title}\" ${CLASS} {\n" "${os}" "${version}"
49	save_default_entry \| sed -e "s/^/\t/"	49	save_default_entry \| sed -e "s/^/\t/"
50	if [ -z "${prepare_boot_cache}" ]; then	50	if [ -z "${prepare_boot_cache}" ]; then
Lines 52-58 Link Here
52	fi	52	fi
53	printf '%s\n' "${prepare_boot_cache}"	53	printf '%s\n' "${prepare_boot_cache}"
54	cat << EOF	54	cat << EOF
55	echo $(printf "$(gettext "Loading kernel of FreeBSD %s ...")" ${version})	55	echo $(printf "Loading kernel of FreeBSD %s ..." ${version})
56	kfreebsd ${rel_dirname}/${basename}	56	kfreebsd ${rel_dirname}/${basename}
57	EOF	57	EOF
58		58




  recovery="$3"
  args="$4"
  if ${recovery} ; then
    title="%s, with Linux %s (recovery mode)"
  else
    title="%s, with Linux %s"
  fi
  printf "menuentry \"${title}\" ${CLASS} {\n" "${os}" "${version}"
  save_default_entry | sed -e "s/^/\t/"

  fi
  printf '%s\n' "${prepare_boot_cache}"
  cat << EOF
	echo	$(printf "Loading Linux %s ..." ${version})
	linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
EOF
  if test -n "${initrd}" ; then
    cat << EOF
	echo	"Loading initial ramdisk ..."
	initrd	${rel_dirname}/${initrd}
EOF
  fi

Return to bug 315449

Lines 343-355 Link Here

(-)grub-1.98.orig/Makefile.in (-7 lines)
343	dest="`echo $$file \| sed 's,.*/,,'`"; \	343	dest="`echo $$file \| sed 's,.*/,,'`"; \
344	$(INSTALL_DATA) $$dir$$file $(DESTDIR)$(libdir)/grub/$$dest; \	344	$(INSTALL_DATA) $$dir$$file $(DESTDIR)$(libdir)/grub/$$dest; \
345	done	345	done
346	@langs='$(LINGUAS)'; \
347	for lang in $$langs; do \
348	$(SHELL) $(mkinstalldirs) $(DESTDIR)/$(datadir)/locale/$$lang/LC_MESSAGES; \
349	file="po/$$lang.mo"; \
350	if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
351	$(INSTALL_DATA) $$dir$$file $(DESTDIR)/$(datadir)/locale/$$lang/LC_MESSAGES/$(PACKAGE).mo; \
352	done
353	$(SHELL) $(mkinstalldirs) $(DESTDIR)$(infodir)	346	$(SHELL) $(mkinstalldirs) $(DESTDIR)$(infodir)
354	@list='$(info_INFOS)'; \	347	@list='$(info_INFOS)'; \
355	for file in $$list; do \	348	for file in $$list; do \

Lines 132-147 Link Here

(-)grub-1.98.orig/util/grub.d/00_header.in (-10 lines)
132	;;	132	;;
133	esac	133	esac
134		134
135	# Gettext variables and module
136	if [ "x${LANG}" != "xC" ] ; then
137	prepare_grub_to_access_device $(${grub_probe} --target=device ${locale_dir})
138	cat << EOF
139	set locale_dir=(\$root)$(make_system_path_relative_to_its_root ${locale_dir})
140	set lang=${grub_lang}
141	insmod gettext
142	EOF
143	fi
144
145	if [ "x${GRUB_HIDDEN_TIMEOUT}" != "x" ] ; then	135	if [ "x${GRUB_HIDDEN_TIMEOUT}" != "x" ] ; then
146	if [ "x${GRUB_HIDDEN_TIMEOUT_QUIET}" = "xtrue" ] ; then	136	if [ "x${GRUB_HIDDEN_TIMEOUT_QUIET}" = "xtrue" ] ; then
147	verbose=	137	verbose=

Lines 76-88 Link Here

(-)grub-1.98.orig/util/grub.d/10_hurd.in (-4 / +4 lines)
76	EOF	76	EOF
77	prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} \| sed -e "s/^/\t/"	77	prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} \| sed -e "s/^/\t/"
78	cat << EOF	78	cat << EOF
79	echo $(gettext "Loading GNU Mach ...")	79	echo "Loading GNU Mach ..."
80	multiboot ${kernel} root=device:${GRUB_DEVICE#/dev/}	80	multiboot ${kernel} root=device:${GRUB_DEVICE#/dev/}
81	EOF	81	EOF
82	save_default_entry \| sed -e "s/^/\t/"	82	save_default_entry \| sed -e "s/^/\t/"
83	prepare_grub_to_access_device ${GRUB_DEVICE} \| sed -e "s/^/\t/"	83	prepare_grub_to_access_device ${GRUB_DEVICE} \| sed -e "s/^/\t/"
84	cat << EOF	84	cat << EOF
85	echo $(gettext "Loading the Hurd ...")	85	echo "Loading the Hurd ..."
86	module /hurd/${hurd_fs}.static ${hurd_fs} --readonly \\	86	module /hurd/${hurd_fs}.static ${hurd_fs} --readonly \\
87	--multiboot-command-line='\${kernel-command-line}' \\	87	--multiboot-command-line='\${kernel-command-line}' \\
88	--host-priv-port='\${host-port}' \\	88	--host-priv-port='\${host-port}' \\
Lines 98-110 Link Here
98	EOF	98	EOF
99	prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} \| sed -e "s/^/\t/"	99	prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} \| sed -e "s/^/\t/"
100	cat << EOF	100	cat << EOF
101	echo $(gettext "Loading GNU Mach ...")	101	echo "Loading GNU Mach ..."
102	multiboot ${kernel} root=device:${GRUB_DEVICE#/dev/} -s	102	multiboot ${kernel} root=device:${GRUB_DEVICE#/dev/} -s
103	EOF	103	EOF
104	save_default_entry \| sed -e "s/^/\t/"	104	save_default_entry \| sed -e "s/^/\t/"
105	prepare_grub_to_access_device ${GRUB_DEVICE} \| sed -e "s/^/\t/"	105	prepare_grub_to_access_device ${GRUB_DEVICE} \| sed -e "s/^/\t/"
106	cat << EOF	106	cat << EOF
107	echo $(gettext "Loading the Hurd ...")	107	echo "Loading the Hurd ..."
108	module /hurd/${hurd_fs}.static ${hurd_fs} \\	108	module /hurd/${hurd_fs}.static ${hurd_fs} \\
109	--multiboot-command-line='\${kernel-command-line}' \\	109	--multiboot-command-line='\${kernel-command-line}' \\
110	--host-priv-port='\${host-port}' \\	110	--host-priv-port='\${host-port}' \\

Lines 56-64 Link Here

(-)grub-1.98.orig/util/grub.d/10_linux.in (-4 / +4 lines)
56	recovery="$3"	56	recovery="$3"
57	args="$4"	57	args="$4"
58	if ${recovery} ; then	58	if ${recovery} ; then
59	title="$(gettext "%s, with Linux %s (recovery mode)")"	59	title="%s, with Linux %s (recovery mode)"
60	else	60	else
61	title="$(gettext "%s, with Linux %s")"	61	title="%s, with Linux %s"
62	fi	62	fi
63	printf "menuentry \"${title}\" ${CLASS} {\n" "${os}" "${version}"	63	printf "menuentry \"${title}\" ${CLASS} {\n" "${os}" "${version}"
64	save_default_entry \| sed -e "s/^/\t/"	64	save_default_entry \| sed -e "s/^/\t/"
Lines 83-94 Link Here
83	fi	83	fi
84	printf '%s\n' "${prepare_boot_cache}"	84	printf '%s\n' "${prepare_boot_cache}"
85	cat << EOF	85	cat << EOF
86	echo $(printf "$(gettext "Loading Linux %s ...")" ${version})	86	echo $(printf "Loading Linux %s ..." ${version})
87	linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}	87	linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
88	EOF	88	EOF
89	if test -n "${initrd}" ; then	89	if test -n "${initrd}" ; then
90	cat << EOF	90	cat << EOF
91	echo $(gettext "Loading initial ramdisk ...")	91	echo "Loading initial ramdisk ..."
92	initrd ${rel_dirname}/${initrd}	92	initrd ${rel_dirname}/${initrd}
93	EOF	93	EOF
94	fi	94	fi