webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Alpha2 - Aenderungen von Arne F. eingepflegt.

Browse Source 
...sonst noch kleine Fixes.


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@569 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2007-05-21 14:42:44 +00:00
parent b9e8554a71
commit 3e615c373b
8 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
html/cgi-bin/pppsetup.cgi
View File

@@ -60,7 +60,7 @@ elsif ($pppsettings{'ACTION'} eq $Lang::tr{'refresh'})
}
elsif ($pppsettings{'ACTION'} eq $Lang::tr{'save'})
{
if ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn)$/ && $pppsettings{'COMPORT'} !~ /^(ttyS0|ttyS1|ttyS2|ttyS3|ttyS4|usb\/ttyACM0|usb\/ttyACM1|usb\/ttyACM2|usb\/ttyACM3|isdn1|isdn2)$/) {
if ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn)$/ && $pppsettings{'COMPORT'} !~ /^(ttyS0|ttyS1|ttyS2|ttyS3|ttyS4|ttyACM0|ttyACM1|ttyACM2|ttyACM3|isdn1|isdn2)$/) {
$errormessage = $Lang::tr{'invalid input'};
goto ERROR; }
if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/ && $pppsettings{'DTERATE'} !~ /^(9600|19200|38400|57600|115200|230400|460800)$/) {
@@ -366,10 +366,10 @@ $selected{'COMPORT'}{'ttyS1'} = '';
$selected{'COMPORT'}{'ttyS2'} = '';
$selected{'COMPORT'}{'ttyS3'} = '';
$selected{'COMPORT'}{'ttyS4'} = '';
$selected{'COMPORT'}{'usb/ttyACM0'} = '';
$selected{'COMPORT'}{'usb/ttyACM1'} = '';
$selected{'COMPORT'}{'usb/ttyACM2'} = '';
$selected{'COMPORT'}{'usb/ttyACM3'} = '';
$selected{'COMPORT'}{'ttyACM0'} = '';
$selected{'COMPORT'}{'ttyACM1'} = '';
$selected{'COMPORT'}{'ttyACM2'} = '';
$selected{'COMPORT'}{'ttyACM3'} = '';
$selected{'COMPORT'}{'isdn1'} = '';
$selected{'COMPORT'}{'isdn2'} = '';
$selected{'COMPORT'}{$pppsettings{'COMPORT'}} = "selected='selected'";

2
langs/de/install/lang_de.c
View File

@@ -374,7 +374,7 @@ char *de_tr[] = {
/* TR_SELECT_INSTALLATION_MEDIA */
"Wählen Sie das Installationsmedium",
/* TR_SELECT_INSTALLATION_MEDIA_LONG */
"%s kann von verschiedenen Programmquellen installiert werden. Am einfachsten ist, Sie benutzen das eingebaute CD-ROM-Laufwerk. Falls der Computer kein CD-ROM-Laufwerk besitzt, können Sie von einem anderen Rechner im LAN installieren, der die Installationsdateien per HTTP oder FTP zur Verfügung stellt. In diesem Fall benötigen Sie zusätzlich die Treiberdiskette.",
"%s kann von verschiedenen Programmquellen installiert werden. Am einfachsten ist, Sie benutzen das eingebaute CD-ROM-Laufwerk. Falls der Computer kein CD-ROM-Laufwerk besitzt, können Sie von einem anderen Rechner im LAN installieren, der die Installationsdateien per HTTP oder FTP zur Verfügung stellt.",
/* TR_SELECT_NETWORK_DRIVER */
"Wählen Sie den Netzwerktreiber aus",
/* TR_SELECT_NETWORK_DRIVER_LONG */

2
langs/en/install/lang_en.c
View File

@@ -370,7 +370,7 @@ char *en_tr[] = {
/* TR_SELECT_INSTALLATION_MEDIA */
"Select installation media",
/* TR_SELECT_INSTALLATION_MEDIA_LONG */
"%s can be installed from multiple sources. The simplest is to use the machines CDROM drive. If the computer lacks a drive, you may install via another machine on the LAN which has the installation files available via HTTP. In this case the network driver diskette will be required.",
"%s can be installed from multiple sources. The simplest is to use the machines CDROM drive. If the computer lacks a drive, you may install via another machine on the LAN which has the installation files available via HTTP or FTP.",
/* TR_SELECT_NETWORK_DRIVER */
"Select network driver",
/* TR_SELECT_NETWORK_DRIVER_LONG */

2
make.sh
View File

@@ -24,7 +24,7 @@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.0b" # Version number
VERSION="2.0a2" # Version number
SLOGAN="www.ipfire.org" # Software slogan
CONFIG_ROOT=/var/ipfire # Configuration rootdir
NICE=10 # Nice level

16
src/misc-progs/timectrl.c
View File

@@ -24,19 +24,19 @@ int main(int argc, char *argv[]) {
}
if (strcmp(argv[1], "start") == 0) {
safe_system("/etc/rc.d/init.d/ntpd start");
safe_system("/etc/rc.d/init.d/ntp start");
} else if (strcmp(argv[1], "stop") == 0) {
safe_system("/etc/rc.d/init.d/ntpd stop");
safe_system("/etc/rc.d/init.d/ntp stop");
} else if (strcmp(argv[1], "restart") == 0) {
safe_system("/etc/rc.d/init.d/ntpd restart");
safe_system("/etc/rc.d/init.d/ntp restart");
} else if (strcmp(argv[1], "enable") == 0) {
safe_system("ln -fs ../init.d/ntpd /etc/rc.d/rc3.d/S26ntpd >/dev/null 2>&1");
safe_system("ln -fs ../init.d/ntpd /etc/rc.d/rc0.d/K46ntpd >/dev/null 2>&1");
safe_system("ln -fs ../init.d/ntpd /etc/rc.d/rc6.d/K46ntpd >/dev/null 2>&1");
safe_system("/etc/rc.d/init.d/ntpd start");
safe_system("ln -fs ../init.d/ntp /etc/rc.d/rc3.d/S26ntpd >/dev/null 2>&1");
safe_system("ln -fs ../init.d/ntp /etc/rc.d/rc0.d/K46ntpd >/dev/null 2>&1");
safe_system("ln -fs ../init.d/ntp /etc/rc.d/rc6.d/K46ntpd >/dev/null 2>&1");
safe_system("/etc/rc.d/init.d/ntp start");
} else if (strcmp(argv[1], "disable") == 0) {
safe_system("/etc/rc.d/init.d/ntpd stop");
safe_system("rm -f /etc/rc.d/rc*.d/*ntpd >/dev/null 2>&1");
safe_system("rm -f /etc/rc.d/rc*.d/*ntp >/dev/null 2>&1");
} else {
fprintf(stderr, "\nBad argument given.\n\ntimectrl (start|stop|restart)\n\n");
exit(1);

2
src/pakfire/pakfire.conf
View File

@@ -2,7 +2,7 @@
package Conf;
$version = "2.0alpha1";
$version = "2.0alpha2";
$mainserver = "pakfire.ipfire.org";

2
src/ppp/ip-down
View File

@@ -17,7 +17,7 @@ require 'CONFIG_ROOT/general-functions.pl';
umask 022;
unlink "${General::swroot}/red/active";
system "/etc/rc.d/init.d/network red update";
system "/etc/rc.d/init.d/net/red/update";
# Beep when ppp goes up or down. Silence if 'nobeeps' file exists.
if ( ! -e "${General::swroot}/ppp/nobeeps") {

2
src/ppp/ip-up
View File

@@ -50,7 +50,7 @@ if (open(FILE, ">${General::swroot}/red/local-ipaddress")) { print FILE $ARGV[3
if (open(FILE, ">${General::swroot}/red/remote-ipaddress")) { print FILE $ARGV[4]; close (FILE); }
system('/usr/bin/touch', "${General::swroot}/red/active");
system('/etc/rc.d/init.d/network red update');
system('/etc/rc.d/init.d/net/red/update');
# Beep when ppp goes up or down. Silence if 'nobeeps' file exists.
if ( ! -e "${General::swroot}/ppp/nobeeps") {