summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/install/gtk.pm10
1 files changed, 4 insertions, 6 deletions
diff --git a/perl-install/install/gtk.pm b/perl-install/install/gtk.pm
index a4479a21b..23c10ccbb 100644
--- a/perl-install/install/gtk.pm
+++ b/perl-install/install/gtk.pm
@@ -257,8 +257,7 @@ sub createXconf {
return if !$Driver;
my $resolution = $Driver eq 'fbdev' ? '"default"' : '"800x600" "640x480"';
- output($file, sprintf(<<'END', $Driver, $resolution));
-Section "ServerFlags"
+ output($file, qq(Section "ServerFlags"
EndSection
Section "Module"
@@ -277,7 +276,7 @@ EndSection
Section "Device"
Identifier "device"
- Driver "%s"
+ Driver In the USB auto-detection checked whether and where the device node was
created.
-rw-r--r--perl-install/detect_devices.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index e658f33e6..e63ba16a8 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -403,8 +403,9 @@ sub whatUsbport() {
my @res = ();
foreach $i (0..15) {
my $port = "/dev/usb/lp$i";
- devices::make("$port");
- open PORT, "$port" or next;
+ my $realport = devices::make("$port");
+ next if (!$realport);
+ open PORT, "$realport" or next;
my $idstr;
# Calculation of IOCTL function 0x84005001 (to get device ID string):
# len = 1024