summaryrefslogtreecommitdiffstats
path: root/perl-install/detect_devices.pm
diff options
context:-rw-r--r--lib/Xconfig/main.pm2
-rw-r--r--lib/Xconfig/test.pm2
-rw-r--r--lib/Xconfig/various.pm10
-rwxr-xr-xtools/XFdrake4
parentae03c25f61467f2eaedc62a23a925237ff8a7e29 (diff --git a/lib/Xconfig/main.pm b/lib/Xconfig/main.pm
index 14857c7..fe8e86a 100644
--- a/
lib/Xconfig/main.pm
+++ b/@@ -207,7 +207,7 @@ sub write {
any.pm: enable module load PPC
detect_devices.pm: forgot to remove commented code after test netconnect.pm: load macserial module for PPC
Diffstat (limited to 'perl-install/detect_devices.pm')
-rw-r--r--perl-install/detect_devices.pm8
1 files changed, 0 insertions, 8 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index d3bdbf8b7..0ceb0b1e4 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -55,15 +55,7 @@ sub burners { grep { $_->{type} eq 'cdrom' && isBurner($_->{device}) } get()
sub IDEburners { grep { $_->{type} eq 'cdrom' && isBurner($_->{device}) } getIDE() }
sub get_mac_model() {
-# open(FILE, "/proc/device-tree/model") || die "Can't open /proc/device-tree/model";
-# my $mac_model = "";
-# local $_ = "";
-# while (<FILE>){
-# $mac_model = $_;
-# }
-# close(FILE);
my $mac_model = cat_("/proc/device-tree/model") || die "Can't open /proc/device-tree/model";
-# chop($mac_model);
log::l("Mac model: $mac_model");
$mac_model;
}
/div>
- symlink "XF86Config.standard", $f;
+ symlink "xorg.conf.standard", $f;
}
}
diff --git a/tools/XFdrake b/tools/XFdrake
index e9e2b61..9805ecd 100755
--- a/tools/XFdrake
+++ b/tools/XFdrake
@@ -79,8 +79,8 @@ sub check_XFree {
my ($in) = @_;
#- set the standard configuration
- foreach ('XF86Config', 'XF86Config-4') {
- my $f = "/etc/X11/$_";
+ {
+ my $f = "/etc/X11/xorg.conf";
symlinkf("$_.standard", $f) if -l $f && -e "$f.standard";
}