summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-07-05 01:24:07 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-07-05 01:24:07 +0000
commit5c932700b6647d2fa43f43372825b54e4d1a9d9d (patch)
treeb757072191b170ed05bfdbdfa50f8d28f7796802
parent666b8ee0bd1f8bba279ba8a6b2a8a06c8d905f90 (diff)
downloaddrakx-5c932700b6647d2fa43f43372825b54e4d1a9d9d.tar
drakx-5c932700b6647d2fa43f43372825b54e4d1a9d9d.tar.gz
drakx-5c932700b6647d2fa43f43372825b54e4d1a9d9d.tar.bz2
drakx-5c932700b6647d2fa43f43372825b54e4d1a9d9d.tar.xz
drakx-5c932700b6647d2fa43f43372825b54e4d1a9d9d.zip
- new option --no-short-name which implies no short labels (usually vmlinuz) and no symlinks (usually /boot/vmlinuz)
- rename --no-link to --no-short-name (keeping compatibility for a few days)
-rwxr-xr-xperl-install/standalone/bootloader-config11
1 files changed, 9 insertions, 2 deletions
diff --git a/perl-install/standalone/bootloader-config b/perl-install/standalone/bootloader-config
index 5d48d0a68..cfaa79236 100755
--- a/perl-install/standalone/bootloader-config
+++ b/perl-install/standalone/bootloader-config
@@ -14,10 +14,13 @@ my %options = (
'vmlinuz=s' => \ (my $vmlinuz),
'initrd-options=s' => \ (my $initrd_options),
- 'no-link' => \ (my $nolink),
+
+ 'no-short-name' => \ (my $no_short_name),
'no-entry' => \ (my $no_entry),
'no-launch' => \ (my $no_launch),
'no-initrd' => \ (my $no_initrd),
+
+ 'no-link' => \ (my $nolink),
);
GetOptions(%options) or die "usage: Releve " . join(' ', map { "[--$_]" } keys %options) . "\n";
@@ -25,6 +28,8 @@ GetOptions(%options) or die "usage: Releve " . join(' ', map { "[--$_]" } keys %
my @known_actions = qw(add-kernel remove-kernel update-splash remove-splash detectloader);
$action && member($action, @known_actions) or die "<action> must be one of " . join(' ', @known_actions) . "\n";
+$no_short_name ||= $nolink;
+
if ($vmlinuz) {
if (my $ver = bootloader::vmlinuz2version($vmlinuz)) {
if ($kernel_version) {
@@ -85,13 +90,15 @@ sub add_kernel() {
bootloader::create_link_source();
my $kernel_str = bootloader::vmlinuz2kernel_str($vmlinuz);
+ $kernel_str->{use_long_name} = $no_short_name;
+
my $root_part = fsedit::get_root([ fsedit::get_fstab(@$hds) ]);
bootloader::add_kernel($bootloader, $kernel_str,
{
root => "/dev/$root_part->{device}",
initrd_options => $initrd_options,
if_($bootloader->{default_vga}, vga => $bootloader->{default_vga}),
- }, $nolink, $no_initrd);
+ }, $no_short_name, $no_initrd);
modify_bootloader();
}