diff options
| author | Francois Pons <fpons@mandriva.com> | 2001-10-03 12:09:45 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2001-10-03 12:09:45 +0000 |
| commit | 5aed26cfa26fbc19d7788103878374884a02383c (patch) | |
| tree | 1093c7399d094bc9cf1afb23763ac8506a76c65b | |
| parent | 8d761374928fbdd00a992a5a5e3efd9b63ab8dd5 (diff) | |
| download | drakx-backup-do-not-use-5aed26cfa26fbc19d7788103878374884a02383c.tar drakx-backup-do-not-use-5aed26cfa26fbc19d7788103878374884a02383c.tar.gz drakx-backup-do-not-use-5aed26cfa26fbc19d7788103878374884a02383c.tar.bz2 drakx-backup-do-not-use-5aed26cfa26fbc19d7788103878374884a02383c.tar.xz drakx-backup-do-not-use-5aed26cfa26fbc19d7788103878374884a02383c.zip | |
removed 3D games not installed by default.
| -rwxr-xr-x | rescue/tree/etc/oem | 4 | ||||
| -rwxr-xr-x | tools/oem-prepare | 11 |
2 files changed, 10 insertions, 5 deletions
diff --git a/rescue/tree/etc/oem b/rescue/tree/etc/oem index db7e52cb6..7d22b815c 100755 --- a/rescue/tree/etc/oem +++ b/rescue/tree/etc/oem @@ -619,8 +619,8 @@ sub select_packages { #- special packages that are to be move to closure always ... foreach (qw(kernel-smp kernel-linus kernel-secure hackkernel-smp hackkernel-linus hackkernel-secure kernel-pcmcia-cs - xawtv kwintv xscreensaver-gl xmms-mesa - bzflag csmash gltron spacecup chromium tuxracer FlightGear armagetron + xawtv kwintv xscreensaver-gl xmms-mesa openuniverse + csmash chromium tuxracer armagetron alsa imwheel nfs-utils-clients lvm usbd hotplug reiserfsprogs xfsprogs jfsprogs sox aumix xmms-arts xawtv gatos kwintv sane-frontends gphoto gnome-toaster gcombust xcdroast apmd cdlabelgen ), exists $options{server} ? qw(Aurora Aurora-Monitor-NewStyle-Categorizing-WsLib) : ()) { diff --git a/tools/oem-prepare b/tools/oem-prepare index b92201273..ab8dda62a 100755 --- a/tools/oem-prepare +++ b/tools/oem-prepare @@ -8,6 +8,8 @@ $mode =~ s/^--(rebuild|clean)$/$1/ or die "mode should be --rebuild or --clean\n 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} = ''; } close F; @@ -21,6 +23,9 @@ foreach ($lang || 'en') { /es/ and ($lang, $flang, $charset) = ('es', 'es_ES@euro', 'iso-8859-15'); } print "Found lang $lang\n"; +foreach (keys %options) { + print "Using option [$_" . ($options{$_} && "=$options{$_}") . "]\n"; +} my $packages = select_packages($dir, $lang); @@ -187,10 +192,10 @@ sub select_packages { #- special packages that are to be move to closure always ... foreach (qw(kernel-smp kernel-linus kernel-secure hackkernel-smp hackkernel-linus hackkernel-secure kernel-pcmcia-cs - xawtv kwintv xscreensaver-gl xmms-mesa - bzflag csmash gltron spacecup chromium tuxracer FlightGear armagetron + xawtv kwintv xscreensaver-gl xmms-mesa openuniverse + csmash chromium tuxracer armagetron alsa imwheel nfs-utils-clients lvm usbd hotplug reiserfsprogs - sox aumix xawtv gatos kwintv sane-frontends gphoto gnome-toaster gcombust xcdroast apmd cdlabelgen + sox aumix xmms-arts xawtv gatos kwintv sane-frontends gphoto gnome-toaster gcombust xcdroast apmd cdlabelgen ), exists $options{server} ? qw(Aurora Aurora-Monitor-NewStyle-Categorizing-WsLib) : ()) { my $pkg = pkgs::packageByName($o->{packages}, $_); if ($pkg) { |