summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone/drakfloppy
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-08-18 08:40:21 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-08-18 08:40:21 +0000
commitf1a976d9cab46367030217f8c1c290550b0ad637 (patch)
tree54215e5ea1b0ec8c3d4b7e91774d0068be33e8da /perl-install/standalone/drakfloppy
parent3c674246ed0ff6b9ed7ea2e871ae9468f55ecd90 (diff)
downloaddrakx-f1a976d9cab46367030217f8c1c290550b0ad637.tar
drakx-f1a976d9cab46367030217f8c1c290550b0ad637.tar.gz
drakx-f1a976d9cab46367030217f8c1c290550b0ad637.tar.bz2
drakx-f1a976d9cab46367030217f8c1c290550b0ad637.tar.xz
drakx-f1a976d9cab46367030217f8c1c290550b0ad637.zip
- fix long-standing broken mkbootdisk call bug
- btw fix the passing of mkinirtd arguments to mkbootdisk
Diffstat (limited to 'perl-install/standalone/drakfloppy')
-rwxr-xr-xperl-install/standalone/drakfloppy15
1 files changed, 9 insertions, 6 deletions
diff --git a/perl-install/standalone/drakfloppy b/perl-install/standalone/drakfloppy
index 73f10be5b..9bbd112c3 100755
--- a/perl-install/standalone/drakfloppy
+++ b/perl-install/standalone/drakfloppy
@@ -283,12 +283,15 @@ sub expand_tree {
# the function
#-------------------------------------------------------------
sub build_it() {
- my $co = "/sbin/mkbootdisk --noprompt --verbose --device " . $device_combo->entry->get_text;
- $co .= " --mkinitrdargs -f" if $options{force};
- $co .= " --mkinitrdargs --ifneeded" if $options{needed};
- $co .= " --mkinitrdargs --omit-scsi-modules" if $options{scsi};
- $co .= " --mkinitrdargs --omit-raid-modules" if $options{raid};
- $co .= join(" --mkinitrdargs --with=", @modules);
+ my $initrd_args = join(' ',
+ if_($options{force}, "-f"),
+ if_($options{needed}, "--ifneeded"),
+ if_($options{scsi}, "--omit-scsi-modules"),
+ if_($options{raid}, "--omit-raid-modules"),
+ if_(@modules, map { my $i = $_; $i =~ s@.*/@@; "--with=$i" } @modules),
+ );
+ $initrd_args = "--mkinitrdargs \"$initrd_args\"" if $initrd_args;
+ my $co = join(' ', "/sbin/mkbootdisk --noprompt --verbose --device", $device_combo->entry->get_text, $initrd_args);
$options{MODULES} = join(' ', @modules);
setVarsInSh($conffile, \%options);