View | Details | Raw Unified | Return to bug 39612
Collapse All | Expand All

(-)file_not_specified_in_diff (-5 / +5 lines)
Line  Link Here
0
-- a/features.in/grub/cfg.in/20install2.cfg
0
++ b/features.in/grub/cfg.in/20install2.cfg
Lines 1-7 Link Here
1
1
2
default='linux'
2
default='linux'
3
3
4
menuentry $"Install @relname@" --hotkey 'i' --id 'linux' {
4
menuentry $"Install "'@distro@' --hotkey 'i' --id 'linux' {
5
  echo $"Loading Linux vmlinuz$KFLAVOUR ..."
5
  echo $"Loading Linux vmlinuz$KFLAVOUR ..."
6
  linux@linux_suffix@ @boot_path@/vmlinuz$KFLAVOUR changedisk fastboot automatic=method:cdrom ramdisk_size=@altinst_size@ vga=@bootvga@ @bootargs@ @efi_bootargs@ lang=$lang
6
  linux@linux_suffix@ @boot_path@/vmlinuz$KFLAVOUR changedisk fastboot automatic=method:cdrom ramdisk_size=@altinst_size@ vga=@bootvga@ @bootargs@ @efi_bootargs@ lang=$lang
7
  echo $"Loading initial ramdisk ..."
7
  echo $"Loading initial ramdisk ..."
8
-- a/features.in/grub/generate.mk
8
++ b/features.in/grub/generate.mk
Lines 68-75 timeout: distro Link Here
68
	sed -i "s,@timeout@,$$TIMEOUT," $(DSTCFGS)
68
	sed -i "s,@timeout@,$$TIMEOUT," $(DSTCFGS)
69
69
70
distro: bootargs
70
distro: bootargs
71
	@if [ -n "$(META_VOL_SET)" ]; then \
71
	@if [ -n "$(META_VOL_ID)" ]; then \
72
		DISTRO="$(META_VOL_SET)"; \
72
		DISTRO="$(META_VOL_ID)"; \
73
	else \
73
	else \
74
		DISTRO="ALT"; \
74
		DISTRO="ALT"; \
75
	fi; \
75
	fi; \

Return to bug 39612