Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow for override of distro name etc. in grub.cfg for EFI boot too. 

Closes: #705610
This commit is contained in:
Steve McIntyre 2013-04-19 15:01:01 +00:00
parent 708240f580
commit 497a82d798
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -5,6 +5,8 @@ debian-cd (3.1.13) UNRELEASED; urgency=low
not hardcode debian-archive-keyring and let derivatives use their
own keyring.
* Add further support for missing win32-loader.ini. Closes: #705594
* Allow for override of distro name etc. in grub.cfg for EFI boot too.
Closes: #705610
-- Raphaël Hertzog <hertzog@debian.org> Fri, 12 Apr 2013 10:32:56 +0200

2
tools/boot/wheezy/boot-x86
View File

@ -421,7 +421,7 @@ if [ -d boot$N/isolinux/grub ] ; then
# Create grub menu entries to match the isolinux ones
sed -i '/^menuentry/Q' $CDDIR/boot/grub/grub.cfg;
$BASEDIR/tools/boot/$DI_CODENAME/parse_isolinux \
boot$N/isolinux $CDDIR $BASEDIR/data/$DI_CODENAME/grub-theme.in "Debian GNU/Linux $DEBVERSION" \
boot$N/isolinux $CDDIR $BASEDIR/data/$DI_CODENAME/grub-theme.in "$DISKINFO_DISTRO" "$DEBIAN_KERNEL" "$DEBVERSION" \
>> $CDDIR/boot/grub/grub.cfg
# Stuff the EFI boot files into a FAT filesystem, making it as

8
tools/boot/wheezy/parse_isolinux
View File

@ -14,7 +14,9 @@ use File::Path qw(make_path);
my $isolinuxdir = shift or die "Need to know where the isolinux directory is!\n";
my $outdir = shift or die "Need to know where to write output!\n";
my $grub_theme = shift or die "Need input file location for base grub theme!\n";
my $tl_desc = shift or die "Need a top-level description (e.g. Debian GNU/Linux 7.0)\n";
my $tl_distro= shift or die "Need a top-level distro name (e.g. Debian)\n";
my $tl_kernel= shift or die "Need a top-level kernel (e.g. GNU/Linux)\n";
my $tl_version= shift or die "Need a top-level version (e.g. 7.0)\n";
my $theme_dir = "$outdir/boot/grub/theme";
my @cpp_and_opts = ('cpp',
'-traditional',
@ -92,7 +94,7 @@ sub create_theme_file {
my $filename = shift;
my @args;
push(@args, @cpp_and_opts);
push(@args, "-DTITLE=\"$tl_desc\"");
push(@args, "-DTITLE=\"$tl_distro $tl_kernel $tl_version\"");
for (my $i = 0; $i < $menudepth; $i++) {
push(@args, "-DMENU$i=\"" . $menu_title[$i] . "\"");
}
@ -115,7 +117,7 @@ parse_file("isolinux.cfg");
$menu{"number"} = "1";
$menu{"label"} = "top";
$menu{"title"} = "Debian GNU/Linux Installer menu";
$menu{"title"} = "$tl_distro $tl_kernel Installer menu";
$menu_title[$menudepth] = $menu{"title"};
my %kernel;

1
tools/start_new_disc
View File

@ -39,6 +39,7 @@ fi
if [ "$DISKINFO_DISTRO"x = ""x ] ; then
DISKINFO_DISTRO="Debian"
fi
export DISKINFO_DISTRO
if [ $NUM_ARCHES = 1 ] ; then
case $ARCHES in