From 03125192f7f42b44b317c3bbfe0e28177895f511 Mon Sep 17 00:00:00 2001 From: Christopher <christopher.spinrath@rwth-aachen.de> Date: Sun, 2 Nov 2014 19:54:01 +0100 Subject: [PATCH] grub.cfg: use grub/lipinfo.cfg if available lipinfo.cfg is most probably generated by lipck and contains the ubuntu flavor (e.g. kubuntu), version, etc. --- grub/grub.cfg | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/grub/grub.cfg b/grub/grub.cfg index 3e52bc6..90074c8 100644 --- a/grub/grub.cfg +++ b/grub/grub.cfg @@ -51,6 +51,17 @@ fi set gfxpayload=keep +#default values +set lip_flavor="Kubuntu" +set lip_version="14.04" +set lip_release="trusty" +set lip_extra_info="" + +#if lipinfo.cfg exists use it to get better values for the lip_* variables. +if [ -f /grub/lipinfo.cfg ]; then + source /grub/lipinfo.cfg +fi + # Start a Debian style Casper Kernel function LoadCasper { echo "Loading kernel-${arch} (takes up to 2 minutes)" @@ -60,12 +71,12 @@ function LoadCasper { echo "Starting kernel" } -menuentry "Empfohlen: Kubuntu 14.04.1 ${bits}bit (deutsch)" { +menuentry "Empfohlen: ${lip_flavor} ${lip_version}${lip_extra_info} ${bits}bit (deutsch)" { set cmdline="debian-installer/locale=de_DE console-setup/layoutcode=de" LoadCasper } -menuentry "Empfohlen: Kubuntu 14.04.1 ${bits}bit (english)" { +menuentry "Empfohlen: ${lip_flavor} ${lip_version}${lip_extra_info} ${bits}bit (english)" { set cmdline="" LoadCasper } @@ -114,22 +125,22 @@ menuentry "Tool: 64bit GParted Live CD (laeuft im RAM -> mindestens 224MB)" { echo "Starting 64 bit GParted kernel" } -menuentry "Kubuntu 14.04.1 ${bits}bit (deutsch, failsafe)" { +menuentry "${lip_flavor} ${lip_version}${lip_extra_info} ${bits}bit (deutsch, failsafe)" { set cmdline="debian-installer/locale=de_DE console-setup/layoutcode=de nomodeset noplymouth nosplash verbose text noacpi" LoadCasper } -menuentry "Kubuntu 14.04.1 ${bits}bit (english, failsafe)" { +menuentry "${lip_flavor} ${lip_version}${lip_extra_info} ${bits}bit (english, failsafe)" { set cmdline="nomodeset noplymouth nosplash verbose text noacpi" LoadCasper } -menuentry "Kubuntu 14.04.1 ${bits}bit (deutsch, load casper from first disk)" { +menuentry "${lip_flavor} ${lip_version}${lip_extra_info} ${bits}bit (deutsch, load casper from first disk)" { set cmdline="debian-installer/locale=de_DE console-setup/layoutcode=de live-media=/dev/sda1" LoadCasper } -menuentry "Kubuntu 14.04.1 ${bits}bit (english, load casper from first disk)" { +menuentry "${lip_flavor} ${lip_version}${lip_extra_info} ${bits}bit (english, load casper from first disk)" { set cmdline="live-media=/dev/sda1" LoadCasper } -- GitLab