summaryrefslogtreecommitdiffstats
path: root/kernel/list_modules.pm
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-11-16 11:21:58 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-11-16 11:21:58 +0000
commit3020086be4aaa61cd9bb31b0096d0da80f3652ca (patch)
tree56765c5ece3016942583d41d837fd6e0de87fe3b /kernel/list_modules.pm
parent0c5037279ed0c5bbfee2576ab51f15b1e68d7fae (diff)
downloaddrakx-3020086be4aaa61cd9bb31b0096d0da80f3652ca.tar
drakx-3020086be4aaa61cd9bb31b0096d0da80f3652ca.tar.gz
drakx-3020086be4aaa61cd9bb31b0096d0da80f3652ca.tar.bz2
drakx-3020086be4aaa61cd9bb31b0096d0da80f3652ca.tar.xz
drakx-3020086be4aaa61cd9bb31b0096d0da80f3652ca.zip
list ibm_emac and oaknet net drivers on PPC
Diffstat (limited to 'kernel/list_modules.pm')
-rw-r--r--kernel/list_modules.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/list_modules.pm b/kernel/list_modules.pm
index 9ddd3b5e6..da93dd316 100644
--- a/kernel/list_modules.pm
+++ b/kernel/list_modules.pm
@@ -14,7 +14,7 @@ our %l = (
network =>
{
main => [
- if_(arch() =~ /ppc/, qw(mace bmac sungem)),
+ if_(arch() =~ /ppc/, qw(bmac ibm_emac mace oaknet sungem)),
if_(arch() =~ /^sparc/, qw(sunbmac sunhme sunqe)),
if_(arch() !~ /alpha|sparc/,
qw(3c501 3c503 3c505 3c507 3c509 3c515 3c90x 3c990 3c990fx),
ass='ctx'>
%make PREFIX=$RPM_BUILD_ROOT install
-mkdir -p $RPM_BUILD_ROOT/{%_initrddir,etc/sysconfig/harddrake2}
+mkdir -p $RPM_BUILD_ROOT/{%_initrddir,%_sysconfdir/{X11/xinit.d,sysconfig/harddrake2}}
touch $RPM_BUILD_ROOT/etc/sysconfig/harddrake2/previous_hw
mv $RPM_BUILD_ROOT%_sbindir/net_monitor \
@@ -193,7 +193,12 @@ my \$last_boot_config = "/etc/sysconfig/harddrake2/previous_hw";
my \$config = do \$last_boot_config;
store \$config, \$last_boot_config;
EOF
-chmod +x $RPM_BUILD_ROOT%_sbindir/convert-harddrake
+
+cat > $RPM_BUILD_ROOT%_sysconfdir/X11/xinit.d/harddrake2 <<EOF
+#!/bin/sh
+exec /usr/share/harddrake/service_harddrake X11
+EOF
+chmod +x $RPM_BUILD_ROOT{%_sbindir/convert-harddrake,%_sysconfdir/X11/xinit.d/harddrake2}
%find_lang libDrakX
cat libDrakX.lang >> %name.list
@@ -252,6 +257,7 @@ file /etc/sysconfig/harddrake2/previous_hw | fgrep -q perl && %_sbindir/convert-
%config(noreplace) /etc/sysconfig/harddrake2/previous_hw
%_datadir/harddrake/service_harddrake
%_sbindir/convert-harddrake
+%_sysconfdir/X11/xinit.d/harddrake2
%files -n harddrake-ui
%defattr(-,root,root)
@@ -273,6 +279,9 @@ file /etc/sysconfig/harddrake2/previous_hw | fgrep -q perl && %_sbindir/convert-
%config(noreplace) %_sysconfdir/logrotate.d/drakxtools-http
%changelog
+* Fri Sep 6 2002 Thierry Vignaud <tvignaud@mandrakesoft.com> 1.1.9-41mdk
+- fix harddrake service, run non essential checks after dm start
+
* Fri Sep 6 2002 Thierry Vignaud <tvignaud@mandrakesoft.com> 1.1.9-40mdk
- harddrake:
o fix usb mouse detection