Touch is an nem anderen Ort...

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@406 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2007-02-04 21:18:14 +00:00
parent 6f30095176
commit 9833e7d8fb
13 changed files with 25 additions and 25 deletions

View File

@@ -1172,7 +1172,7 @@ sub buildconf {
}# foreach line }# foreach line
print FILE "} #$itf\n"; print FILE "} #$itf\n";
system ('/bin/touch', "${General::swroot}/dhcp/enable_${lc_itf}"); system ('/usr/bin/touch', "${General::swroot}/dhcp/enable_${lc_itf}");
&General::log("DHCP on ${itf}: " . $Lang::tr{'dhcp server enabled'}) &General::log("DHCP on ${itf}: " . $Lang::tr{'dhcp server enabled'})
} else { } else {
unlink "${General::swroot}/dhcp/enable_${lc_itf}"; unlink "${General::swroot}/dhcp/enable_${lc_itf}";

View File

@@ -36,7 +36,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'dial profile'})
unlink("${General::swroot}/ppp/settings"); unlink("${General::swroot}/ppp/settings");
link("${General::swroot}/ppp/settings-$cgiparams{'PROFILE'}", link("${General::swroot}/ppp/settings-$cgiparams{'PROFILE'}",
"${General::swroot}/ppp/settings"); "${General::swroot}/ppp/settings");
system ("/bin/touch", "${General::swroot}/ppp/updatesettings"); system ("/usr/bin/touch", "${General::swroot}/ppp/updatesettings");
# read in the new params "early" so we can write secrets. # read in the new params "early" so we can write secrets.
%cgiparams = (); %cgiparams = ();

View File

@@ -59,7 +59,7 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}")
# Set flag if index page is to refresh whilst ppp is up. # Set flag if index page is to refresh whilst ppp is up.
# Default is NO refresh. # Default is NO refresh.
if ($cgiparams{'REFRESHINDEX'} ne 'off') { if ($cgiparams{'REFRESHINDEX'} ne 'off') {
system ('/bin/touch', "${General::swroot}/main/refreshindex"); system ('/usr/bin/touch', "${General::swroot}/main/refreshindex");
} else { } else {
unlink "${General::swroot}/main/refreshindex"; unlink "${General::swroot}/main/refreshindex";
} }
@@ -67,7 +67,7 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}")
# Beep on ip-up or ip-down. Default is ON. # Beep on ip-up or ip-down. Default is ON.
if ($cgiparams{'PPPUPDOWNBEEP'} ne 'on') { if ($cgiparams{'PPPUPDOWNBEEP'} ne 'on') {
$cgiparams{'PPPUPDOWNBEEP'} = 'off'; $cgiparams{'PPPUPDOWNBEEP'} = 'off';
system ('/bin/touch', "${General::swroot}/ppp/nobeeps"); system ('/usr/bin/touch', "${General::swroot}/ppp/nobeeps");
} else { } else {
unlink "${General::swroot}/ppp/nobeeps"; unlink "${General::swroot}/ppp/nobeeps";
} }

View File

@@ -62,25 +62,25 @@ if ($snortsettings{'ACTION'} eq $Lang::tr{'save'})
&General::writehash("${General::swroot}/snort/settings", \%snortsettings); &General::writehash("${General::swroot}/snort/settings", \%snortsettings);
if ($snortsettings{'ENABLE_SNORT'} eq 'on') if ($snortsettings{'ENABLE_SNORT'} eq 'on')
{ {
system ('/bin/touch', "${General::swroot}/snort/enable"); system ('/usr/bin/touch', "${General::swroot}/snort/enable");
} else { } else {
unlink "${General::swroot}/snort/enable"; unlink "${General::swroot}/snort/enable";
} }
if ($snortsettings{'ENABLE_SNORT_GREEN'} eq 'on') if ($snortsettings{'ENABLE_SNORT_GREEN'} eq 'on')
{ {
system ('/bin/touch', "${General::swroot}/snort/enable_green"); system ('/usr/bin/touch', "${General::swroot}/snort/enable_green");
} else { } else {
unlink "${General::swroot}/snort/enable_green"; unlink "${General::swroot}/snort/enable_green";
} }
if ($snortsettings{'ENABLE_SNORT_BLUE'} eq 'on') if ($snortsettings{'ENABLE_SNORT_BLUE'} eq 'on')
{ {
system ('/bin/touch', "${General::swroot}/snort/enable_blue"); system ('/usr/bin/touch', "${General::swroot}/snort/enable_blue");
} else { } else {
unlink "${General::swroot}/snort/enable_blue"; unlink "${General::swroot}/snort/enable_blue";
} }
if ($snortsettings{'ENABLE_SNORT_ORANGE'} eq 'on') if ($snortsettings{'ENABLE_SNORT_ORANGE'} eq 'on')
{ {
system ('/bin/touch', "${General::swroot}/snort/enable_orange"); system ('/usr/bin/touch', "${General::swroot}/snort/enable_orange");
} else { } else {
unlink "${General::swroot}/snort/enable_orange"; unlink "${General::swroot}/snort/enable_orange";
} }

View File

@@ -71,7 +71,7 @@ if ($outfwsettings{'ACTION'} eq $Lang::tr{'reset'})
{ {
$outfwsettings{'POLICY'}='MODE0'; $outfwsettings{'POLICY'}='MODE0';
unlink $configfile; unlink $configfile;
system("/bin/touch $configfile"); system("/usr/bin/touch $configfile");
&General::writehash("${General::swroot}/outgoing/settings", \%outfwsettings); &General::writehash("${General::swroot}/outgoing/settings", \%outfwsettings);
} }
if ($outfwsettings{'ACTION'} eq $Lang::tr{'save'}) if ($outfwsettings{'ACTION'} eq $Lang::tr{'save'})

View File

@@ -718,7 +718,7 @@ END
(my $state = $cgiparams{'ROOTCERT_STATE'}) =~ s/^\s*$/\./; (my $state = $cgiparams{'ROOTCERT_STATE'}) =~ s/^\s*$/\./;
# refresh # refresh
#system ('/bin/touch', "${General::swroot}/ovpn/gencanow"); #system ('/usr/bin/touch', "${General::swroot}/ovpn/gencanow");
# Create the CA certificate # Create the CA certificate
my $pid = open(OPENSSL, "|-"); my $pid = open(OPENSSL, "|-");

View File

@@ -1118,7 +1118,7 @@ sub updatesettings
unlink("${General::swroot}/ppp/settings"); unlink("${General::swroot}/ppp/settings");
link("${General::swroot}/ppp/settings-$pppsettings{'PROFILE'}", link("${General::swroot}/ppp/settings-$pppsettings{'PROFILE'}",
"${General::swroot}/ppp/settings"); "${General::swroot}/ppp/settings");
system ("/bin/touch", "${General::swroot}/ppp/updatesettings"); system ("/usr/bin/touch", "${General::swroot}/ppp/updatesettings");
if ($pppsettings{'TYPE'} eq 'eagleusbadsl') { if ($pppsettings{'TYPE'} eq 'eagleusbadsl') {
# eagle-usb.conf is in backup but link DSPcode.bin can't, so the link is created in rc.eagleusbadsl # eagle-usb.conf is in backup but link DSPcode.bin can't, so the link is created in rc.eagleusbadsl
open(FILE, ">/${General::swroot}/eagle-usb/eagle-usb.conf") or die "Unable to write eagle-usb.conf file"; open(FILE, ">/${General::swroot}/eagle-usb/eagle-usb.conf") or die "Unable to write eagle-usb.conf file";

View File

@@ -600,13 +600,13 @@ ERROR:
unlink "${General::swroot}/proxy/transparent_blue"; unlink "${General::swroot}/proxy/transparent_blue";
if ($proxysettings{'ENABLE'} eq 'on') { if ($proxysettings{'ENABLE'} eq 'on') {
system ('/bin/touch', "${General::swroot}/proxy/enable"); } system ('/usr/bin/touch', "${General::swroot}/proxy/enable"); }
if ($proxysettings{'TRANSPARENT'} eq 'on') { if ($proxysettings{'TRANSPARENT'} eq 'on') {
system ('/bin/touch', "${General::swroot}/proxy/transparent"); } system ('/usr/bin/touch', "${General::swroot}/proxy/transparent"); }
if ($proxysettings{'ENABLE_BLUE'} eq 'on') { if ($proxysettings{'ENABLE_BLUE'} eq 'on') {
system ('/bin/touch', "${General::swroot}/proxy/enable_blue"); } system ('/usr/bin/touch', "${General::swroot}/proxy/enable_blue"); }
if ($proxysettings{'TRANSPARENT_BLUE'} eq 'on') { if ($proxysettings{'TRANSPARENT_BLUE'} eq 'on') {
system ('/bin/touch', "${General::swroot}/proxy/transparent_blue"); } system ('/usr/bin/touch', "${General::swroot}/proxy/transparent_blue"); }
if ($proxysettings{'ACTION'} eq $Lang::tr{'advproxy save and restart'}) { system('/usr/local/bin/restartsquid'); } if ($proxysettings{'ACTION'} eq $Lang::tr{'advproxy save and restart'}) { system('/usr/local/bin/restartsquid'); }
} }

View File

@@ -396,7 +396,7 @@ elsif ($qossettings{'DOTOS'} eq 'Loeschen')
if ($qossettings{'ACTION'} eq 'Start') if ($qossettings{'ACTION'} eq 'Start')
{ {
system("/usr/local/bin/qosctrl generate >/dev/null 2>&1"); system("/usr/local/bin/qosctrl generate >/dev/null 2>&1");
system("/bin/touch /var/ipfire/qos/enable"); system("/usr/bin/touch /var/ipfire/qos/enable");
system("/usr/local/bin/qosctrl start >/dev/null 2>&1"); system("/usr/local/bin/qosctrl start >/dev/null 2>&1");
system("logger -t ipfire 'QoS started'"); system("logger -t ipfire 'QoS started'");
$qossettings{'ENABLED'} = 'on'; $qossettings{'ENABLED'} = 'on';
@@ -1480,8 +1480,8 @@ sub gengraph {
"LINE3:overlimits#0000FF:overlimits", "LINE3:overlimits#0000FF:overlimits",
"GPRINT:overlimits:LAST:overlimits\\:%8.3lf %s packets\\j", "GPRINT:overlimits:LAST:overlimits\\:%8.3lf %s packets\\j",
); );
$ERROR = RRDs::error; $ERROR = RRDs::error;
print "$ERROR"; #print "$ERROR";
} }
sub overviewgraph { sub overviewgraph {
@@ -1523,7 +1523,7 @@ sub overviewgraph {
} }
RRDs::graph (@command); RRDs::graph (@command);
$ERROR = RRDs::error; $ERROR = RRDs::error;
print "$ERROR"; #print "$ERROR";
} }
sub random_hex_color { sub random_hex_color {

View File

@@ -47,7 +47,7 @@ if ($remotesettings{'ACTION'} eq $Lang::tr{'save'})
{ {
$errormessage = $Lang::tr{'ssh no auth'}; $errormessage = $Lang::tr{'ssh no auth'};
} }
system ('/bin/touch', "${General::swroot}/remote/enablessh"); system ('/usr/bin/touch', "${General::swroot}/remote/enablessh");
} }
else else
{ {

View File

@@ -123,7 +123,7 @@ ERROR:
if ($timesettings{'ENABLENTP'} eq 'on' && $timesettings{'VALID'} eq 'yes') if ($timesettings{'ENABLENTP'} eq 'on' && $timesettings{'VALID'} eq 'yes')
{ {
system ('/bin/touch', "${General::swroot}/time/enable"); system ('/usr/bin/touch', "${General::swroot}/time/enable");
&General::log($Lang::tr{'ntp syncro enabled'}); &General::log($Lang::tr{'ntp syncro enabled'});
unlink "${General::swroot}/time/counter"; unlink "${General::swroot}/time/counter";
if ($timesettings{'UPDATE_METHOD'} eq 'periodically') if ($timesettings{'UPDATE_METHOD'} eq 'periodically')
@@ -135,7 +135,7 @@ ERROR:
} }
if ($timesettings{'ENABLECLNTP'} eq 'on') # DPC added to 1.3.1 if ($timesettings{'ENABLECLNTP'} eq 'on') # DPC added to 1.3.1
{ {
system ('/bin/touch', "${General::swroot}/time/allowclients"); # DPC added to 1.3.1 system ('/usr/bin/touch', "${General::swroot}/time/allowclients"); # DPC added to 1.3.1
&General::log($Lang::tr{'ntpd restarted'}); # DPC added to 1.3.1 &General::log($Lang::tr{'ntpd restarted'}); # DPC added to 1.3.1
} else { } else {
unlink "${General::swroot}/time/allowclients"; unlink "${General::swroot}/time/allowclients";
@@ -159,7 +159,7 @@ ERROR:
$timesettings{'ACTION'} = &Header::cleanhtml ($timesettings{'ACTION'}); $timesettings{'ACTION'} = &Header::cleanhtml ($timesettings{'ACTION'});
if ($timesettings{'ACTION'} eq $Lang::tr{'set time now'} && $timesettings{'ENABLENTP'} eq 'on') if ($timesettings{'ACTION'} eq $Lang::tr{'set time now'} && $timesettings{'ENABLENTP'} eq 'on')
{ {
system ('/bin/touch', "${General::swroot}/time/settimenow"); system ('/usr/bin/touch', "${General::swroot}/time/settimenow");
system ('/usr/local/bin/timecheckctrl >& /dev/null'); system ('/usr/local/bin/timecheckctrl >& /dev/null');
} }

View File

@@ -50,7 +50,7 @@ if ($uptimesettings{'ACTION'} eq $Lang::tr{'save'})
elsif ($uptimesettings{'ACTION'} eq $Lang::tr{'uptime enable'}) elsif ($uptimesettings{'ACTION'} eq $Lang::tr{'uptime enable'})
{ {
&save_configuration(); &save_configuration();
system("/bin/touch ${General::swroot}/uptime/enabled"); system("/usr/bin/touch ${General::swroot}/uptime/enabled");
system("/usr/local/bin/yasucctrl enable"); system("/usr/local/bin/yasucctrl enable");
} }
elsif ($uptimesettings{'ACTION'} eq $Lang::tr{'uptime disable'}) elsif ($uptimesettings{'ACTION'} eq $Lang::tr{'uptime disable'})

View File

@@ -14,7 +14,7 @@
#define CDROM_INSTALL 0 #define CDROM_INSTALL 0
#define URL_INSTALL 1 #define URL_INSTALL 1
#define DISK_INSTALL 2 #define DISK_INSTALL 2
#define INST_FILECOUNT 6600 #define INST_FILECOUNT 7000
#define UNATTENDED_CONF "/cdrom/boot/unattended.conf" #define UNATTENDED_CONF "/cdrom/boot/unattended.conf"
int raid_disk = 0; int raid_disk = 0;