From 1fde937c88877da136f3056a986335c879348076 Mon Sep 17 00:00:00 2001 From: delaco Date: Tue, 18 Jul 2006 18:10:21 +0000 Subject: [PATCH] Hinzugefuegt: * Promise-Sata-300 und SataII-150-Kernel-Modul hinzugefuegt fuer SMP und einen Prozessor. * Morningreconnect in den ConnScheduler gelegt. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@212 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- config/cfgroot/connscheduler.conf | 1 + config/cfgroot/header.pl | 14 +++-- doc/packages-list.txt | 10 ++-- html/cgi-bin/outgoingfw.cgi | 1 + html/cgi-bin/pppsetup.cgi | 13 ----- html/cgi-bin/wakeonlan.cgi | 2 +- lfs/configroot | 3 +- lfs/promise-sata-300-tx | 88 +++++++++++++++++++++++++++++++ make.sh | 7 ++- 9 files changed, 115 insertions(+), 24 deletions(-) create mode 100644 config/cfgroot/connscheduler.conf create mode 100644 lfs/promise-sata-300-tx diff --git a/config/cfgroot/connscheduler.conf b/config/cfgroot/connscheduler.conf new file mode 100644 index 0000000000..0700506243 --- /dev/null +++ b/config/cfgroot/connscheduler.conf @@ -0,0 +1 @@ +on,reconnect,,06:00,weekdays,,Mon Tue Wed Thu Fri Sat Sun ,,MorningReconnect diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl index 1cb3d957be..251c1e9491 100644 --- a/config/cfgroot/header.pl +++ b/config/cfgroot/header.pl @@ -250,25 +250,31 @@ sub genmenu { 'title' => "$tr{'alt dialup'}", 'enabled' => 1, }; - $subnetwork->{'50.hosts'} = { + $subnetwork->{'50.scheduler'} = { + 'caption' => $tr{'scheduler'}, + 'uri' => '/cgi-bin/connscheduler.cgi', + 'title' => "$tr{'scheduler'}", + 'enabled' => 1, + }; + $subnetwork->{'60.hosts'} = { 'caption' => $tr{'edit hosts'}, 'uri' => '/cgi-bin/hosts.cgi', 'title' => "$tr{'edit hosts'}", 'enabled' => 1, }; - $subnetwork->{'60.upload'} = { + $subnetwork->{'70.upload'} = { 'caption' => $tr{'upload'}, 'uri' => '/cgi-bin/upload.cgi', 'title' => "$tr{'upload'}", 'enabled' => 0, }; - $subnetwork->{'70.aliases'} = { + $subnetwork->{'80.aliases'} = { 'caption' => $tr{'aliases'}, 'uri' => '/cgi-bin/aliases.cgi', 'title' => "$tr{'aliases'}", 'enabled' => 0, }; - $subnetwork->{'80.wakeonlan'} = { + $subnetwork->{'90.wakeonlan'} = { 'caption' => $tr{'WakeOnLan'}, 'uri' => '/cgi-bin/wakeonlan.cgi', 'title' => "$tr{'WakeOnLan'}", diff --git a/doc/packages-list.txt b/doc/packages-list.txt index a50971ddaf..c696a6eea7 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -34,7 +34,7 @@ * applejuice-0.30 * arping-2.05 * as86-0.16.17 - * asterisk-1.2.7.1 + * asterisk-1.2.9.1 * autoconf-2.59 * automake-1.8.4 * bash-2.05b @@ -45,6 +45,7 @@ * bison-1.875 * bootsplash-3.2 * bridge-utils-1.1 + * bristuff-0.3.0-PRE-1q * busybox-0.60.5 * bzip2-1.0.3 * capi4k-utils-2004-10-06 @@ -131,6 +132,7 @@ * libnet-1.1.2.1 * libpcap-0.8.3 * libpng-1.2.8 + * libpri-1.2.3 * libsafe_2.0-16 * libtool-1.5.6 * libusb-0.1.7 @@ -170,7 +172,6 @@ * ntop-3.2 * ntp-4.2.0 * oinkmaster-1.2 - * openh323-Mimas_patch2 * openldap-2.3.20 * openssh-3.9p1 * openssl-0.9.7i @@ -193,16 +194,17 @@ * procps-3.2.5 * psmisc-21.4 * pulsar-4.0.19 - * pwlib-ipfire1 * razor-agents-2.81 * rp-pppoe-3.5 * rrdtool-1.0.49 * samba-3.0.22 + * sata300_sataii150_tx_series_linux2.4_open_source_1.00.0.15 * screen-4.0.2 * sed-4.0.9 * setserial-2.17 * shadow-4.0.4.1 * slang-1.4.5-mini + * smartmontools-5.36 * snort-2.3.3 * spandsp-0.0.2pre25 * speedtouch-1.2 @@ -231,4 +233,6 @@ * wput-0.6 * xampp-linux-1.5.3a * xinetd-2.3.14 + * xmbmon205 + * zaptel-1.2.6 * zlib-1.2.3 diff --git a/html/cgi-bin/outgoingfw.cgi b/html/cgi-bin/outgoingfw.cgi index b68e7e1791..78ee951c44 100644 --- a/html/cgi-bin/outgoingfw.cgi +++ b/html/cgi-bin/outgoingfw.cgi @@ -52,6 +52,7 @@ $outfwsettings{'DISPLAY_DIP'} = ''; $outfwsettings{'DISPLAY_DPORT'} = ''; $outfwsettings{'DISPLAY_SMAC'} = ''; $outfwsettings{'DISPLAY_SIP'} = ''; +$outfwsettings{'POLICY'} = 'MODE0'; &General::readhash("${General::swroot}/outgoing/settings", \%outfwsettings); &Header::getcgihash(\%outfwsettings); diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi index 3e60865185..65893b7abb 100644 --- a/html/cgi-bin/pppsetup.cgi +++ b/html/cgi-bin/pppsetup.cgi @@ -55,9 +55,6 @@ elsif ($pppsettings{'ACTION'} eq $Lang::tr{'refresh'}) } elsif ($pppsettings{'ACTION'} eq $Lang::tr{'save'}) { - if ($pppsettings{'MORNINGRECONNECT'} eq 'on') - { system("/bin/touch /var/ipfire/ppp/morningreconnect"); } - else { unlink "/var/ipfire/ppp/morningreconnect"; } if ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn)$/ && $pppsettings{'COMPORT'} !~ /^(ttyS0|ttyS1|ttyS2|ttyS3|ttyS4|usb\/ttyACM0|usb\/ttyACM1|usb\/ttyACM2|usb\/ttyACM3|isdn1|isdn2)$/) { $errormessage = $Lang::tr{'invalid input'}; goto ERROR; } @@ -398,10 +395,6 @@ $checked{'DIALONDEMANDDNS'}{'off'} = ''; $checked{'DIALONDEMANDDNS'}{'on'} = ''; $checked{'DIALONDEMANDDNS'}{$pppsettings{'DIALONDEMANDDNS'}} = "checked='checked'"; -$checked{'MORNINGRECONNECT'}{'off'} = ''; -$checked{'MORNINGRECONNECT'}{'on'} = ''; -$checked{'MORNINGRECONNECT'}{$pppsettings{'MORNINGRECONNECT'}} = "checked='checked'"; - $checked{'AUTOCONNECT'}{'off'} = ''; $checked{'AUTOCONNECT'}{'on'} = ''; $checked{'AUTOCONNECT'}{$pppsettings{'AUTOCONNECT'}} = "checked='checked'"; @@ -692,12 +685,6 @@ print <$Lang::tr{'maximum retries'} - - Morning Reconnect: - -   -   - END ; diff --git a/html/cgi-bin/wakeonlan.cgi b/html/cgi-bin/wakeonlan.cgi index ff60304af1..87d540cbbb 100644 --- a/html/cgi-bin/wakeonlan.cgi +++ b/html/cgi-bin/wakeonlan.cgi @@ -157,7 +157,7 @@ if ( $cgiparams{'ACTION'} eq 'wakeup' ) # make a box with info, 'refresh' to normal screen after 5 seconds if ( $refresh eq 'yes' ) { - &Header::openpage($Lang::tr{'WakeOnLan'}, 1, " # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = linux2.4_open_source_1.00.0.15 + +THISAPP = sata300_sataii150_tx_series_$(VER) +DL_FILE = $(THISAPP).tgz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/pdc-ulsata2 +ifeq "$(SMP)" "" + TARGET = $(DIR_INFO)/$(THISAPP) +else + TARGET = $(DIR_INFO)/$(THISAPP)-smp +endif + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 369e88bf60321771bfd3ffc1f1d412f5 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && make +ifeq "$(SMP)" "" + cd $(DIR_APP) && install -m 644 -o 0 ulsata2.o /lib/modules/$(KVER)/kernel/drivers/scsi + find /lib/modules/$(KVER)/kernel/drivers/scsi -name 'ulsata2.o' -a -type f | xargs gzip -f9 +else + cd $(DIR_APP) && install -m 644 -o 0 ulsata2.o /lib/modules/$(KVER)-smp/kernel/drivers/scsi + find /lib/modules/$(KVER)-smp/kernel/drivers/scsi -name 'ulsata2.o' -a -type f | xargs gzip -f9 +endif + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index e703e09161..1073e0e321 100644 --- a/make.sh +++ b/make.sh @@ -551,6 +551,7 @@ buildipcop() { ipcopmake fcclassic SMP=1 ipcopmake pulsar SMP=1 ipcopmake unicorn SMP=1 + ipcopmake promise-sata-300-tx SMP=1 fi ipcopmake linux LFS_PASS=ipfire @@ -571,8 +572,9 @@ buildipcop() { ipcopmake fcdslslusb ipcopmake fcpci ipcopmake fcclassic - ipcopmake pulsar - ipcopmake unicorn + ipcopmake pulsar + ipcopmake unicorn + ipcopmake promise-sata-300-tx fi ipcopmake pcmcia-cs @@ -707,6 +709,7 @@ buildipcop() { ipcopmake bridge-utils ipcopmake screen ipcopmake hddtemp + ipcopmake smartmontools ipcopmake htop ipcopmake lynx echo -ne "`date -u '+%b %e %T'`: Building ### Mailserver ### \n" | tee -a $LOGFILE -- 2.39.2