Attachment #208875 for bug #291332

Lines 571-576 Link Here

(-)grub2-1.97~beta1/loader/i386/linux.c (-4 / +10 lines)
571	grub_ssize_t len;	571	grub_ssize_t len;
572	int i;	572	int i;
573	char *dest;	573	char *dest;
		574	char *quiet;
574		575
575	grub_dl_ref (my_mod);	576	grub_dl_ref (my_mod);
576		577
Lines 685-692 Link Here
685		686
686	grub_file_seek (file, real_size + GRUB_DISK_SECTOR_SIZE);	687	grub_file_seek (file, real_size + GRUB_DISK_SECTOR_SIZE);
687		688
688	grub_printf (" [Linux-bzImage, setup=0x%x, size=0x%x]\n",	689	quiet = grub_env_get ("quiet");
689	(unsigned) real_size, (unsigned) prot_size);	690	if (!quiet \|\| *quiet == '0')
		691	grub_printf (" [Linux-bzImage, setup=0x%x, size=0x%x]\n",
		692	(unsigned) real_size, (unsigned) prot_size);
690		693
691	/* Look for memory size and video mode specified on the command line. */	694	/* Look for memory size and video mode specified on the command line. */
692	linux_mem_size = 0;	695	linux_mem_size = 0;
Lines 867-872 Link Here
867	grub_addr_t addr_min, addr_max;	870	grub_addr_t addr_min, addr_max;
868	grub_addr_t addr;	871	grub_addr_t addr;
869	struct linux_kernel_header *lh;	872	struct linux_kernel_header *lh;
		873	char *quiet;
870		874
871	if (argc == 0)	875	if (argc == 0)
872	{	876	{
Lines 936-943 Link Here
936	goto fail;	940	goto fail;
937	}	941	}
938		942
939	grub_printf (" [Initrd, addr=0x%x, size=0x%x]\n",	943	quiet = grub_env_get ("quiet");
940	(unsigned) addr, (unsigned) size);	944	if (!quiet \|\| *quiet == '0')
		945	grub_printf (" [Initrd, addr=0x%x, size=0x%x]\n",
		946	(unsigned) addr, (unsigned) size);
941		947
942	lh->ramdisk_image = addr;	948	lh->ramdisk_image = addr;
943	lh->ramdisk_size = size;	949	lh->ramdisk_size = size;

Lines 53-58 Link Here

(-)grub2-1.97~beta1/util/grub.d/10_linux.in (-1 / +7 lines)
53	cat << EOF	53	cat << EOF
54	menuentry "$1" {	54	menuentry "$1" {
55	EOF	55	EOF
		56	if [ "x$3" = "xquiet" ]; then
		57	cat << EOF
		58	set quiet=1
		59	EOF
		60	fi
56	prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} \| sed -e "s/^/\t/"	61	prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} \| sed -e "s/^/\t/"
57	cat << EOF	62	cat << EOF
58	linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro $2	63	linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro $2
Lines 98-104 Link Here
98	fi	103	fi
99		104
100	linux_entry "${OS}, Linux ${version}" \	105	linux_entry "${OS}, Linux ${version}" \
101	"${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_EXTRA} ${GRUB_CMDLINE_LINUX_DEFAULT}"	106	"${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_EXTRA} ${GRUB_CMDLINE_LINUX_DEFAULT}" \
		107	quiet
102	if [ "x${GRUB_DISABLE_LINUX_RECOVERY}" != "xtrue" ]; then	108	if [ "x${GRUB_DISABLE_LINUX_RECOVERY}" != "xtrue" ]; then
103	linux_entry "${OS}, Linux ${version} (recovery mode)" \	109	linux_entry "${OS}, Linux ${version} (recovery mode)" \
104	"single ${GRUB_CMDLINE_LINUX}"	110	"single ${GRUB_CMDLINE_LINUX}"

Return to bug 291332