From 068d599562888a36a50e5bbdeb8b70f83fa7c287 Mon Sep 17 00:00:00 2001 From: Mystery Man Date: Tue, 7 Aug 2001 17:40:36 +0000 Subject: This commit was manufactured by cvs2svn to create branch 'v_webmin_0_87'. --- perl-install/unused/.cvsignore | 1 - perl-install/unused/cdrom.pm | 41 ---------- perl-install/unused/christmas-karaoke.patch | 115 ---------------------------- perl-install/unused/dns.pm | 64 ---------------- perl-install/unused/otherinsmod.pm | 26 ------- perl-install/unused/scsi.pm | 104 ------------------------- 6 files changed, 351 deletions(-) delete mode 100644 perl-install/unused/.cvsignore delete mode 100644 perl-install/unused/cdrom.pm delete mode 100644 perl-install/unused/christmas-karaoke.patch delete mode 100644 perl-install/unused/dns.pm delete mode 100644 perl-install/unused/otherinsmod.pm delete mode 100644 perl-install/unused/scsi.pm (limited to 'perl-install/unused') diff --git a/perl-install/unused/.cvsignore b/perl-install/unused/.cvsignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/perl-install/unused/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/perl-install/unused/cdrom.pm b/perl-install/unused/cdrom.pm deleted file mode 100644 index 040ac7e98..000000000 --- a/perl-install/unused/cdrom.pm +++ /dev/null @@ -1,41 +0,0 @@ -package cdrom; # $Id$ - -use diagnostics; -use strict; - -use detect_devices; - - -my %transTable = ( cm206 => 'cm206cd', sonycd535 => 'cdu535'); - -1; - - -sub setupCDdevicePanel { - my ($type) = @_; -} - -sub findAtapi { - my $ide = ideGetDevices(); - foreach (@$ide) { $_->{type} eq 'cdrom' and return $_->{device} } - error(); -} - -sub findSCSIcdrom { - detect_devices::isSCSI() or return error(); - my $scsi = detect_devices::getSCSI(); - foreach (@$scsi) { $_->{type} eq 'cdrom' and return $_->{device} } - error(); -} - -sub setupCDdevice { - my ($cddev, $dl) = @_; - #-TODO -} - -sub removeCDmodule { - #- this wil fail silently if no CD module has been loaded - removeDeviceDriver('cdrom'); - 1; -} - diff --git a/perl-install/unused/christmas-karaoke.patch b/perl-install/unused/christmas-karaoke.patch deleted file mode 100644 index 1311f7eba..000000000 --- a/perl-install/unused/christmas-karaoke.patch +++ /dev/null @@ -1,115 +0,0 @@ -Index: Makefile -=================================================================== -RCS file: /home/cvs/cooker/gi/perl-install/Makefile,v -retrieving revision 1.151 -diff -u -r1.151 Makefile ---- Makefile 2000/12/19 18:21:05 1.151 -+++ Makefile 2000/12/20 23:29:33 -@@ -44,7 +44,7 @@ - - cp share/*.rc $(DESTREP4PMS) - install -d $(DESTREP4PMS)/po -- cp -f share/po/*.po* $(DESTREP4PMS)/po ||: -+# cp -f share/po/*.po* $(DESTREP4PMS)/po ||: - chmod a+x $(DESTREP4PMS)/install2 - chmod a+x $(DESTREP4PMS)/commands - chmod a+x $(DESTREP4PMS)/standalone/* -@@ -61,6 +61,21 @@ - cat `../tools/specific_arch share/list` >> /tmp/list - find auto -follow -name "*.so" >> /tmp/list - -+ rpm -ql icewm-light | grep /usr/X11R6 >> /tmp/list -+ rpm -ql xmms libao0 | grep /usr/lib >> /tmp/list -+ echo /sbin/isapnp >> /tmp/list -+ echo /sbin/pnpdump >> /tmp/list -+ echo /usr/sbin/sndconfig >> /tmp/list -+ echo /usr/bin/vim >> /tmp/list -+ echo /usr/bin/aumix >> /tmp/list -+ echo /usr/bin/ogg123 >> /tmp/list -+ echo /usr/bin/qiv >> /tmp/list -+ echo /usr/lib/libimlib-jpeg.so >> /tmp/list -+ echo /usr/bin/xmms >> /tmp/list -+ echo /usr/lib/xmms/Visualization/libxmms_singit.so >> /tmp/list -+ echo /usr/X11R6/lib/X11/rgb.txt >> /tmp/list -+ echo /bin/bash >> /tmp/list -+ - for i in $(LOCALFILES) `cat /tmp/list` ; do \ - ldd $$i 2>/dev/null | grep "=>" | sed -e 's/.*=> //' -e 's/ .*//' | uniq | sort >> /tmp/list; \ - done -@@ -106,6 +121,7 @@ - fi; \ - done - mv -f $(DEST)/lib/libimlib-png.so $(DEST)/usr/lib -+ mv -f $(DEST)/lib/libimlib-jpeg.so $(DEST)/usr/lib - - mv -f $(DEST)/bin/* $(DEST)/sbin/* $(DEST)/usr/bin - cd $(DEST)/usr/bin ; mv insmod insmod_ -@@ -135,6 +151,16 @@ - - # echo -e '#!/bin/sh\n\nexec "/usr/bin/sh"' > $(DEST)/usr/bin/runinstall2 - # chmod a+x $(DEST)/usr/bin/runinstall2 -+ -+ rm -f $(DEST)/usr/X11R6/lib/X11/fonts/{gb16st,k14,taipei16,baekmuk_gulim_12}.pcf.gz -+ cp -f /usr/X11R6/lib/X11/fonts2/75dpi/helv* $(DEST)/usr/X11R6/lib/X11/fonts/ -+ mkfontdir $(DEST)/usr/X11R6/lib/X11/fonts 2>/dev/null -+ install $(ROOTDEST)/Mandrake/images/rotate $(DEST)/usr/bin -+ -+ echo -e "prog xmms xmms xmms\nprog aumix aumix aumix" > $(DEST)/usr/X11R6/lib/X11/icewm/toolbar -+ echo -e "prog xmms xmms xmms\nprog aumix aumix aumix" > $(DEST)/usr/X11R6/lib/X11/icewm/menu -+ echo -e "Theme=bluePlastic/default.theme\nTaskBarAutoHide=1" > $(DEST)/usr/X11R6/lib/X11/icewm/preferences -+ - - ifeq (i386,$(ARCH)) - cp -a /etc/pcmcia $(DEST)/etc -Index: install_steps_gtk.pm -=================================================================== -RCS file: /home/cvs/cooker/gi/perl-install/install_steps_gtk.pm,v -retrieving revision 1.171 -diff -u -r1.171 install_steps_gtk.pm ---- install_steps_gtk.pm 2000/12/20 21:57:35 1.171 -+++ install_steps_gtk.pm 2000/12/20 23:29:33 -@@ -99,6 +99,27 @@ - } - } - OK: -+ keyboard::setup("fr"); -+ commands::mknod("/dev/dsp", "c", 14, 3); -+ commands::mknod("/dev/mixer", "c", 14, 0); -+ if (!$::expert) { -+ if (!modules::load_thiskind("sound")) { -+ eval { -+ symlink "/usr/bin/pnpdump", "/sbin/pnpdump"; -+ run_program::run("sndconfig", "--quiet"); -+ run_program::run("isapnp", "/etc/isapnp.conf"); -+ my @l = cat_("/etc/modules.conf"); -+ my $module; /alias sound-slot-0 (\S+)/ and $module = $1 foreach @l; -+ my @options; /options\s+$module\s+(.*)/ and @options = split ' ', $1 foreach @l; -+ modules::load($module, 'sound', @options); -+ } -+ } -+ } -+ symlink "/tmp/rhimage/lyrics", "/lyrics"; -+ symlink "/tmp/rhimage", "/Sound"; -+ fork or exec "rotate /tmp/rhimage/Mandrake/images" or die; -+ fork or exec $_ or die foreach "xmms"; -+ exec "icewm-light" or die; - install_gtk::init_sizes(); - install_gtk::default_theme($o); - install_gtk::create_logo_window($o); -Index: interactive_gtk.pm -=================================================================== -RCS file: /home/cvs/cooker/gi/perl-install/interactive_gtk.pm,v -retrieving revision 1.94 -diff -u -r1.94 interactive_gtk.pm ---- interactive_gtk.pm 2000/12/18 19:36:04 1.94 -+++ interactive_gtk.pm 2000/12/20 23:29:33 -@@ -351,6 +351,9 @@ - $ok - )); - widget($widgets[0],$val->[0])->grab_focus(); -+ -+# mapn { $_[0]{expert} and $_[1]->hide } $val, \@widgets, $l; -+ - if ($hcallback{complete}) { - my $callback = sub { - my ($error, $focus) = &{$hcallback{complete}}; diff --git a/perl-install/unused/dns.pm b/perl-install/unused/dns.pm deleted file mode 100644 index 5e6bb5f5b..000000000 --- a/perl-install/unused/dns.pm +++ /dev/null @@ -1,64 +0,0 @@ -use diagnostics; -use strict; - -# This is dumb, but glibc doesn't like to do hostname lookups w/o libc.so - - -#TODO TODO -sub doQuery { -# my ($query, $queryType, $domainName, $ipNum) = @_; -# -# _res.retry = 2; -# -# len = res_search(query, C_IN, queryType, (void *) &response, -# sizeof(response)); -# if (len <= 0) return -1; -# -# if (ntohs(response.hdr.rcode) != NOERROR) return -1; -# ancount = ntohs(response.hdr.ancount); -# if (ancount < 1) return -1; -# -# data = response.buf + sizeof(HEADER); -# end = response.buf + len; -# -# # skip the question -# data += dn_skipname(data, end) + QFIXEDSZ; -# -# # parse the answer(s) -# while (--ancount >= 0 && data < end) { -# -# # skip the domain name portion of the RR record -# data += dn_skipname(data, end); -# -# # get RR information -# GETSHORT(type, data); -# data += INT16SZ; # skipp class -# data += INT32SZ; # skipp TTL -# GETSHORT(len, data); -# -# if (type == T_PTR) { -# # we got a pointer -# len = dn_expand(response.buf, end, data, name, sizeof(name)); -# if (len <= 0) return -1; -# if (queryType == T_PTR && domainName) { -# # we wanted a pointer -# *domainName = malloc(strlen(name) + 1); -# strcpy(*domainName, name); -# return 0; -# } -# } else if (type == T_A) { -# # we got an address -# if (queryType == T_A && ipNum) { -# # we wanted an address -# memcpy(ipNum, data, sizeof(*ipNum)); -# return 0; -# } -# } -# -# # move ahead to next RR -# data += len; -# } -# -# return -1; -} - diff --git a/perl-install/unused/otherinsmod.pm b/perl-install/unused/otherinsmod.pm deleted file mode 100644 index 1a8eee9ff..000000000 --- a/perl-install/unused/otherinsmod.pm +++ /dev/null @@ -1,26 +0,0 @@ -use diagnostics; -use strict; - -sub insmod { - - @_ or die "usage: insmod .o [params]\n"; - - my $file = shift; - my $tmpname; - - unless (-r $file) { - local *F; - open F, "/modules/modules.cgz" or die "error opening /modules/modules.cgz"; - - $tmpname = "/tmp/" . basename($file); - - installCpioFile(\*F, $file, $tmpname, 0) or die "error extracting file"; - } - - my $rc = insmod_main($tmpname || $file, @_); - - unlink($tmpname); - - return $rc; -} -sub modprobe { &insmod } diff --git a/perl-install/unused/scsi.pm b/perl-install/unused/scsi.pm deleted file mode 100644 index 8e20f7d70..000000000 --- a/perl-install/unused/scsi.pm +++ /dev/null @@ -1,104 +0,0 @@ -use diagnostics; -use strict; - -my $scsiDeviceAvailable; -my $CSADeviceAvailable; - -1; - -sub scsiDeviceAvailable { - defined $scsiDeviceAvailable and return $scsiDeviceAvailable; - local *F; - open F, "/proc/scsi/scsi" or log::l("failed to open /proc/scsi/scsi: $!"), return 0; - foreach () { - /devices: none/ and log::l("no scsi devices are available"), return $scsiDeviceAvailable = 0; - } - log::l("scsi devices are available"); - $scsiDeviceAvailable = 1; -} - -sub CompaqSmartArrayDeviceAvailable { - defined $CSADeviceAvailable and return $CSADeviceAvailable; - -r "/proc/array/ida0" or log::l("failed to open /proc/array/ida0: $!"), return $CSADeviceAvailable = 0; - log::l("Compaq Smart Array controllers available"); - $CSADeviceAvailable = 1; -} - -sub scsiGetDevices { - my @drives; - my ($driveNum, $cdromNum, $tapeNum) = qw(0 0 0); - my $err = sub { chop; log::l("unexpected line in /proc/scsi/scsi: $_"); error() }; - local $_; - - local *F; - open F, "/proc/scsi/scsi" or return &$err(); - $_ = ; /^Attached devices:/ or return &$err(); - while ($_ = ) { - my ($id) = /^Host:.*?Id: (\d+)/ or return &$err(); - $_ = ; my ($vendor, $model) = /^\s*Vendor:\s*(.*?)\s+Model:\s*(.*?)\s+Rev:/ or return &$err(); - $_ = ; my ($type) = /^\s*Type:\s*(.*)/ or &$err(); - my $device; - if ($type =~ /Direct-Access/) { - $type = 'hd'; - $device = "sd" . chr($driveNum++ + ord('a')); - } elsif ($type =~ /Sequential-Access/) { - $type = 'tape'; - $device = "st" . $tapeNum++; - } elsif ($type =~ /CD-ROM/) { - $type = 'cdrom'; - $device = "scd" . $cdromNum++; - } - $device and push @drives, { device => $device, type => $type, info => "$vendor $model", id => $id, bus => 0 }; - } - [ @drives ]; -} - -sub ideGetDevices { - my @idi; - - -r "/proc/ide" or die "sorry, /proc/ide not available, seems like you have a pre-2.2 kernel\n => not handled yet :("; - - #- Great. 2.2 kernel, things are much easier and less error prone. - foreach my $d (glob_('/proc/ide/hd*')) { - my ($t) = chomp_(cat_("$d/media")); - my $type = $ {{disk => 'hd', cdrom => 'cdrom', tape => 'tape', floppy => 'fd'}}{$t} or next; - my ($info) = chomp_(cat_("$d/model")); $info ||= "(none)"; - - my $num = ord (($d =~ /(.)$/)[0]) - ord 'a'; - push @idi, { type => $type, device => basename($d), info => $info, bus => $num/2, id => $num%2 }; - } - [ @idi ]; -} - - -sub CompaqSmartArrayGetDevices { - my @idi; - my $f; - - for (my $i = 0; -r ($f = "/proc/array/ida$i"); $i++) { - local *F; - open F, $f or die; - local $_ = ; - my ($name) = m|ida/(.*?):| or next; - push @idi, { device => $name, info => "Compaq RAID logical disk", type => 'hd' }; - } - [ @idi ]; -} - -sub dac960GetDevices { - my @idi; - my $file = "/var/log/dmesg"; - -r $file or $file = "/tmp/syslog"; - - local *F; - open F, $file or die "Failed to open $file: $!"; - - #- We are looking for lines of this format:DAC960#0: - #- /dev/rd/c0d0: RAID-7, Online, 17928192 blocks, Write Thru0123456790123456789012 - foreach () { - my ($devicename, $info) = m|/dev/rd/(.*?): (.*?),| or next; - push @idi, { info => $info, type => 'hd', devicename => $devicename }; - log::l("DAC960: $devicename: $info"); - } - [ @idi ]; -} -- cgit v1.2.1