summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/ChangeLog6
-rw-r--r--perl-install/Xconfigurator.pm2
-rwxr-xr-xperl-install/live_install5
3 files changed, 12 insertions, 1 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index 6f2ed4511..449263bfe 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,3 +1,9 @@
+2000-10-03 François Pons <fpons@mandrakesoft.com>
+
+ * Xconfigurator.pm: updated bad card with Rage Mobility card.
+
+ * live_install: added test of root user, abort if not root.
+
2000-10-03 Guillaume Cottenceau <gc@mandrakesoft.com>
* share/po/fr.po: fixed bug #518 and fixed other misc errors
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index d123dde46..1e515ac05 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -415,7 +415,7 @@ sub testFinalConfig {
#- needed for bad cards not restoring cleanly framebuffer
my $bad_card = $o->{card}{identifier} =~ /i740|ViRGE/;
- $bad_card ||= $o->{card}{identifier} eq "ATI|3D Rage P/M Mobility AGP 2x";
+ $bad_card ||= $o->{card}{identifier} =~ /Rage Mobility (?:P\/M|L) / || $o->{card}{identifier} =~ /3D Rage (?:LT|Pro)/;
$bad_card ||= $o->{card}{use_xf4}; #- TODO obsoleted to check, when using fbdev of XFree 4.0!
log::l("the graphic card does not like X in framebuffer") if $bad_card;
diff --git a/perl-install/live_install b/perl-install/live_install
index a98583690..74b4ff9c9 100755
--- a/perl-install/live_install
+++ b/perl-install/live_install
@@ -1,5 +1,10 @@
#!/bin/sh
+if [ "$UID" -ne 0 ]; then
+ echo >&2 "you need to be root to start live install"
+ exit 3
+fi
+
if [ -x ./Mandrake/mdkinst/usr/bin/perl-install/live_install2 ]; then
dir=`pwd`/Mandrake/mdkinst
elif [ -x ../../../../../Mandrake/mdkinst/usr/bin/perl-install/live_install2 ]; then