1
0
mirror of synced 2026-01-13 15:17:30 +00:00

Fix initial configuration summary in cases where pygrub is used

This commit is contained in:
Axel Beckert 2014-09-25 23:18:48 +02:00
parent 71e5ad4345
commit 48097cd07b
2 changed files with 17 additions and 11 deletions

View File

@ -2563,19 +2563,24 @@ sub showSummary
logprint("Max mem size : $CONFIG{'maxmem'}\n");
}
if ( defined( $CONFIG{ 'kernel' } ) && length( $CONFIG{ 'kernel' } ) )
{
logprint("Kernel path : $CONFIG{'kernel'}\n");
}
if ( exists( $CONFIG{ 'pygrub' } ) &&
$CONFIG{ 'pygrub' } ) {
logprint("Bootloader : pygrub\n");
} else {
if ( defined( $CONFIG{ 'kernel' } ) && length( $CONFIG{ 'kernel' } ) )
{
logprint("Kernel path : $CONFIG{'kernel'}\n");
}
if ( defined( $CONFIG{ 'modules' } ) && length( $CONFIG{ 'modules' } ) )
{
logprint("Module path : $CONFIG{'modules'}\n");
}
if ( defined( $CONFIG{ 'modules' } ) && length( $CONFIG{ 'modules' } ) )
{
logprint("Module path : $CONFIG{'modules'}\n");
}
if ( defined( $CONFIG{ 'initrd' } ) && length( $CONFIG{ 'initrd' } ) )
{
logprint("Initrd path : $CONFIG{'initrd'}\n");
if ( defined( $CONFIG{ 'initrd' } ) && length( $CONFIG{ 'initrd' } ) )
{
logprint("Initrd path : $CONFIG{'initrd'}\n");
}
}
logprint("\nNetworking Information\n");

1
debian/changelog vendored
View File

@ -18,6 +18,7 @@ xen-tools (4.4+dev-1) UNRELEASED; urgency=low
+ Fix lvcreate awaiting user input when creating swap lv (Closes: #754517)
Thanks Eric Engstrom!
+ Fix missing quoting in shell function "assert" in hooks/common.sh.
+ Fix initial configuration summary in cases where pygrub is used.
* Bump Standards-Version to 3.9.6 (no changes needed)
* Fix lintian warning depends-on-perl-modules.