summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2002-04-17 12:14:56 +0000
committerFrancois Pons <fpons@mandriva.com>2002-04-17 12:14:56 +0000
commit0c56057106daf838c912ce4812a9a6b2ce573713 (patch)
tree8438f7fdeba80b10e82d4bab10ca3f6a66dda03e
parent4f0b321b31916a38f20f168b53c07e8dbb7c344c (diff)
downloaddrakx-0c56057106daf838c912ce4812a9a6b2ce573713.tar
drakx-0c56057106daf838c912ce4812a9a6b2ce573713.tar.gz
drakx-0c56057106daf838c912ce4812a9a6b2ce573713.tar.bz2
drakx-0c56057106daf838c912ce4812a9a6b2ce573713.tar.xz
drakx-0c56057106daf838c912ce4812a9a6b2ce573713.zip
final candidate.
-rwxr-xr-xrescue/tree/etc/oem11
-rwxr-xr-xtools/oem-prepare2
2 files changed, 2 insertions, 11 deletions
diff --git a/rescue/tree/etc/oem b/rescue/tree/etc/oem
index b11109d1b..f6eef0722 100755
--- a/rescue/tree/etc/oem
+++ b/rescue/tree/etc/oem
@@ -123,7 +123,7 @@ open F, "/cdrom/VERSION" or die "no installation cdrom found on $cd";
while (<F>) {
/[\s-]fr/ and $options{lang} = 'fr';
/\[lang[=:]([^]]*)\]/ and $options{lang} = $1;
- /\[server\]/ and $options{server} = '';
+ /[\[\-]server[\]\-]/ and $options{server} = '';
/\[boot_entries[=:]([^]]*)\]/ and $options{boot_entries} = $1;
/\[ext2\]/ and $options{fs} = "ext2";
/\[ext3\]/ and $options{fs} = "ext3";
@@ -727,15 +727,6 @@ sub select_packages {
}
}
- #- special packages that are to be removed always... BEWARE THIS IS A HACK !!!
-# foreach (qw(gmc gcc3.0 gcc3.0-c++ gcc3.0-cpp libstdc++3.0 libstdc++3.0-devel)) {
-# my $pkg = pkgs::packageByName($o->{packages}, $_);
-# if ($pkg) {
-# delete $pkg->{closure};
-# delete $pkg->{selected};
-# }
-# }
-
$o->{packages};
}
diff --git a/tools/oem-prepare b/tools/oem-prepare
index c0448a6c8..3c0b09a86 100755
--- a/tools/oem-prepare
+++ b/tools/oem-prepare
@@ -9,7 +9,7 @@ open F, "$dir/VERSION" or die "no installation found on $dir";
while (<F>) {
/[\s-]fr/ and $lang = 'fr';
/\[lang[=:]([^]]*)\]/ and $lang = $1;
- /\[server\]/ and $options{server} = '';
+ /[\[\-]server[\]\-]/ and $options{server} = '';
}
close F;