summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mandriva.org>2009-03-11 14:26:34 +0000
committerPascal Terjan <pterjan@mandriva.org>2009-03-11 14:26:34 +0000
commitfca910f0c562148e0e25098cd9af73795e6b5834 (patch)
tree998d9c79e6a08fa5f13d8f9c2e9c7a4cf06993f1
parent2706f70450d403c1fa0500396adc0872426f0ba8 (diff)
downloaddrakx-fca910f0c562148e0e25098cd9af73795e6b5834.tar
drakx-fca910f0c562148e0e25098cd9af73795e6b5834.tar.gz
drakx-fca910f0c562148e0e25098cd9af73795e6b5834.tar.bz2
drakx-fca910f0c562148e0e25098cd9af73795e6b5834.tar.xz
drakx-fca910f0c562148e0e25098cd9af73795e6b5834.zip
include virtio modules (#45518)
-rw-r--r--kernel/list_modules.pm6
-rw-r--r--perl-install/install/NEWS1
2 files changed, 5 insertions, 2 deletions
diff --git a/kernel/list_modules.pm b/kernel/list_modules.pm
index a876aad13..f6aa47f2f 100644
--- a/kernel/list_modules.pm
+++ b/kernel/list_modules.pm
@@ -41,7 +41,7 @@ our %l = (
],
firewire => [ qw(eth1394 pcilynx) ],
gigabit => [
- qw(atl1 atl1c atl1e bnx2 bnx2x cxgb cxgb3 dl2k e1000 e1000e et131x igb ipg ixgb ixgbe myri_sbus netxen_nic ns83820 qla3xxx r8169 s2io sfc sxg sis190 sk98lin skge sky2 spidernet tehuti tg3 via-velocity yellowfin),
+ qw(atl1 atl1c atl1e bnx2 bnx2x cxgb cxgb3 dl2k e1000 e1000e et131x igb ipg ixgb ixgbe myri_sbus netxen_nic ns83820 qla3xxx r8169 s2io sfc sxg sis190 sk98lin skge sky2 spidernet tehuti tg3 via-velocity virtio_net yellowfin),
qw(bcm5820 bcm5700), #- encrypted
],
@@ -135,7 +135,7 @@ our %l = (
),
],
pcmcia => [ qw(aha152x_cs fdomain_cs nsp_cs qlogic_cs ide-cs pata_pcmcia sym53c500_cs) ],
- raw => [ qw(ide-disk sd_mod) ],
+ raw => [ qw(ide-disk sd_mod virtio_blk) ],
usb => [ qw(usb-storage) ],
firewire => [ qw(sbp2) ],
cdrom => [ qw(ide-cd_mod sr_mod) ],
@@ -273,6 +273,8 @@ our %l = (
#- these need checking
qw(rrunner meye),
+
+ qw(virtio_pci, virtio_balloon),
],
agpgart => [
if_(arch() =~ /alpha/, qw(alpha-agp)),
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 749bde880..fc493f2b2 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,4 +1,5 @@
- fix displaying help (same webkit regression that affected mcc (#47840))
+- include virtio modules (#45518)
Version 12.13 - 10 March 2009
my $check; $check = sub { my ($part, @seen) = @_; push @seen, $part->{mntpoint} || return; @seen > 1 && $part->{mntpoint} eq $base_mntpoint and die _("Circular mounts %s\n", join(", ", @seen)); if (my $part = fs::up_mount_point($part->{mntpoint}, $fstab)) { #- '/' carrier is a special case, it will be mounted first $check->($part, @seen) if !carryRootLoopback($part); } if (isLoopback($part)) { $check->($part->{loopback_device}, @seen); } }; $check->($part) if !($base_mntpoint eq '/' && isLoopback($part)); #- '/' is a special case, no loop check } sub carryRootCreateSymlink { my ($part, $prefix) = @_; carryRootLoopback($part) or return; my $mntpoint = "$prefix$part->{mntpoint}"; unless (-e $mntpoint) { eval { mkdir_p(dirname($mntpoint)) }; #- do non-relative link for install, should be changed to relative link before rebooting symlink "/initrd/loopfs", $mntpoint; mkdir_p("/initrd/loopfs/lnx4win/boot"); symlink "/initrd/loopfs/lnx4win/boot", "$prefix/boot"; } #- indicate kernel to keep initrd mkdir "$prefix/initrd", 0755; } sub format_part { my ($part, $prefix) = @_; fs::mount_part($part->{loopback_device}, $prefix); create($part, $prefix); fs::real_format_part($part); } sub create { my ($part, $prefix) = @_; my $f = $part->{device} = "$prefix$part->{loopback_device}{mntpoint}$part->{loopback_file}"; return if -e $f; eval { mkdir_p(dirname($f)) }; log::l("creating loopback file $f ($part->{size} sectors)"); local *F; my $block_size = 128; my $s = "\0" x (512 * $block_size); sysopen F, $f, 2 | c::O_CREAT() or die "failed to create loopback file"; for (my $i = 0; $i < $part->{size}; $i += $block_size) { syswrite F, $s or die "failed to create loopback file"; } } sub getFree { my ($dir, $part) = @_; my $freespace = $dir ? 2 * (MDK::Common::System::df($dir))[1] : #- df in KiB $part->{size}; $freespace - sum map { $_->{size} } @{$part->{loopback} || []}; } #- returns the size of the loopback file if it already exists #- returns -1 is the loopback file can't be used sub verifFile { my ($dir, $file, $part) = @_; -e "$dir$file" and return -s "$dir$file"; $_->{loopback_file} eq $file and return -1 foreach @{$part->{loopback} || []}; undef; } sub prepare_boot { my ($prefix) = @_; my $r = readlink "$prefix/boot"; unlink "$prefix/boot"; mkdir "$prefix/boot", 0755; [$r, $prefix]; } sub save_boot { my ($loop_boot, $prefix) = @{$_[0]}; $loop_boot or return; my @files = glob_("$prefix/boot/*"); cp_af(@files, $loop_boot) if @files; rm_rf("$prefix/boot"); symlink $loop_boot, "$prefix/boot"; } 1;