summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Ginies <aginies@mandriva.com>2004-01-29 09:17:37 +0000
committerAntoine Ginies <aginies@mandriva.com>2004-01-29 09:17:37 +0000
commit91ab0fd424fe7db86976bbe6b646ab69b3673095 (patch)
tree307dec088525b56509a60c244ae4ddc430646b10
parent8fb528fb9c0ece0bb7a58996ab9bfa49aa6431d7 (diff)
downloaddrakwizard-91ab0fd424fe7db86976bbe6b646ab69b3673095.tar
drakwizard-91ab0fd424fe7db86976bbe6b646ab69b3673095.tar.gz
drakwizard-91ab0fd424fe7db86976bbe6b646ab69b3673095.tar.bz2
drakwizard-91ab0fd424fe7db86976bbe6b646ab69b3673095.tar.xz
drakwizard-91ab0fd424fe7db86976bbe6b646ab69b3673095.zip
fix error from previous correction (pxe was unable to read old conf!)
-rw-r--r--pxe_wizard/Pxe.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/pxe_wizard/Pxe.pm b/pxe_wizard/Pxe.pm
index 184e94a4..20a88514 100644
--- a/pxe_wizard/Pxe.pm
+++ b/pxe_wizard/Pxe.pm
@@ -446,7 +446,7 @@ sub read_option {
system("mount $IMGPATH/$IMG.img $mount -o loop 2>/dev/null");
my $line = cat_("$mount/syslinux.cfg");
$o->{var}{i} = "$IMGPATH/$IMG.img";
- ($o->{var}{METHOD}, $o->{var}{ETH}, $o->{var}{IP}, $o->{var}{DIR}, $o->{var}{RAM}, $o->{var}{VGA}, $o->{var}{ACPI}, $o->{var}{APIC}) = $line =~ m!/method:(nfs|http),interface:(eth0|eth1|eth2),network:dhcp,server:(.*?),directory:(.*?) ramdisk_size=(.*?) root=/dev/ram3 rw vga=(.*?)acpi=(ht|force|off)\s(apic|noapic)!;
+ ($o->{var}{METHOD}, $o->{var}{ETH}, $o->{var}{IP}, $o->{var}{DIR}, $o->{var}{RAM}, $o->{var}{VGA}, $o->{var}{ACPI}, $o->{var}{APIC}) = $line =~ m!method:(nfs|http),interface:(eth0|eth1|eth2),network:dhcp,server:(.*?),directory:(.*?) ramdisk_size=(.*?) root=/dev/ram3 rw vga=(.*?)acpi=(ht|force|off)\s(apic|noapic)!;
system("umount $mount");
if (-e $mount) {
rm_rf($mount);