From: ms Date: Mon, 21 May 2007 14:42:44 +0000 (+0000) Subject: Alpha2 - Aenderungen von Arne F. eingepflegt. X-Git-Tag: v2.3-beta1~690 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=3e615c373b0922e55d438020683be94e697cc283 Alpha2 - Aenderungen von Arne F. eingepflegt. ...sonst noch kleine Fixes. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@569 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi index e2dd4fc9ee..ed9c16da6a 100644 --- a/html/cgi-bin/pppsetup.cgi +++ b/html/cgi-bin/pppsetup.cgi @@ -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'"; diff --git a/langs/de/install/lang_de.c b/langs/de/install/lang_de.c index 6ad668dc05..fefd9d622e 100644 --- a/langs/de/install/lang_de.c +++ b/langs/de/install/lang_de.c @@ -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 */ diff --git a/langs/en/install/lang_en.c b/langs/en/install/lang_en.c index d9d9a8dd3d..035aa0ce49 100644 --- a/langs/en/install/lang_en.c +++ b/langs/en/install/lang_en.c @@ -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 */ diff --git a/make.sh b/make.sh index 8a3adb55dc..dbf8a075e8 100755 --- a/make.sh +++ b/make.sh @@ -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 diff --git a/src/misc-progs/timectrl.c b/src/misc-progs/timectrl.c index 7c9fa5981f..f09e641b30 100644 --- a/src/misc-progs/timectrl.c +++ b/src/misc-progs/timectrl.c @@ -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); diff --git a/src/pakfire/pakfire.conf b/src/pakfire/pakfire.conf index 973cbe92a7..5024a770ec 100644 --- a/src/pakfire/pakfire.conf +++ b/src/pakfire/pakfire.conf @@ -2,7 +2,7 @@ package Conf; -$version = "2.0alpha1"; +$version = "2.0alpha2"; $mainserver = "pakfire.ipfire.org"; diff --git a/src/ppp/ip-down b/src/ppp/ip-down index 0d5e26deef..474fa95dd8 100644 --- a/src/ppp/ip-down +++ b/src/ppp/ip-down @@ -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") { diff --git a/src/ppp/ip-up b/src/ppp/ip-up index 918dba65c2..4dc6c05a94 100644 --- a/src/ppp/ip-up +++ b/src/ppp/ip-up @@ -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") {