From 9833e7d8fb019c603664d5a246773f501c97a974 Mon Sep 17 00:00:00 2001 From: ms Date: Sun, 4 Feb 2007 21:18:14 +0000 Subject: [PATCH] Touch is an nem anderen Ort... git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@406 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- html/cgi-bin/dhcp.cgi | 2 +- html/cgi-bin/dial.cgi | 2 +- html/cgi-bin/gui.cgi | 4 ++-- html/cgi-bin/ids.cgi | 8 ++++---- html/cgi-bin/outgoingfw.cgi | 2 +- html/cgi-bin/ovpnmain.cgi | 2 +- html/cgi-bin/pppsetup.cgi | 2 +- html/cgi-bin/proxy.cgi | 8 ++++---- html/cgi-bin/qos.cgi | 8 ++++---- html/cgi-bin/remote.cgi | 2 +- html/cgi-bin/time.cgi | 6 +++--- html/cgi-bin/uptime.cgi | 2 +- src/install+setup/install/main.c | 2 +- 13 files changed, 25 insertions(+), 25 deletions(-) diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi index 06019f98b3..364c5d7dbc 100644 --- a/html/cgi-bin/dhcp.cgi +++ b/html/cgi-bin/dhcp.cgi @@ -1172,7 +1172,7 @@ sub buildconf { }# foreach line 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'}) } else { unlink "${General::swroot}/dhcp/enable_${lc_itf}"; diff --git a/html/cgi-bin/dial.cgi b/html/cgi-bin/dial.cgi index 8f4a51f487..a3690973e5 100644 --- a/html/cgi-bin/dial.cgi +++ b/html/cgi-bin/dial.cgi @@ -36,7 +36,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'dial profile'}) unlink("${General::swroot}/ppp/settings"); link("${General::swroot}/ppp/settings-$cgiparams{'PROFILE'}", "${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. %cgiparams = (); diff --git a/html/cgi-bin/gui.cgi b/html/cgi-bin/gui.cgi index e1e8b0d742..7af6f11c1d 100644 --- a/html/cgi-bin/gui.cgi +++ b/html/cgi-bin/gui.cgi @@ -59,7 +59,7 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}") # Set flag if index page is to refresh whilst ppp is up. # Default is NO refresh. if ($cgiparams{'REFRESHINDEX'} ne 'off') { - system ('/bin/touch', "${General::swroot}/main/refreshindex"); + system ('/usr/bin/touch', "${General::swroot}/main/refreshindex"); } else { 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. if ($cgiparams{'PPPUPDOWNBEEP'} ne 'on') { $cgiparams{'PPPUPDOWNBEEP'} = 'off'; - system ('/bin/touch', "${General::swroot}/ppp/nobeeps"); + system ('/usr/bin/touch', "${General::swroot}/ppp/nobeeps"); } else { unlink "${General::swroot}/ppp/nobeeps"; } diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index dee7cfc729..8b74167ac9 100644 --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -62,25 +62,25 @@ if ($snortsettings{'ACTION'} eq $Lang::tr{'save'}) &General::writehash("${General::swroot}/snort/settings", \%snortsettings); if ($snortsettings{'ENABLE_SNORT'} eq 'on') { - system ('/bin/touch', "${General::swroot}/snort/enable"); + system ('/usr/bin/touch', "${General::swroot}/snort/enable"); } else { unlink "${General::swroot}/snort/enable"; } 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 { unlink "${General::swroot}/snort/enable_green"; } 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 { unlink "${General::swroot}/snort/enable_blue"; } 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 { unlink "${General::swroot}/snort/enable_orange"; } diff --git a/html/cgi-bin/outgoingfw.cgi b/html/cgi-bin/outgoingfw.cgi index d4274bd77d..ab7c2fa08d 100644 --- a/html/cgi-bin/outgoingfw.cgi +++ b/html/cgi-bin/outgoingfw.cgi @@ -71,7 +71,7 @@ if ($outfwsettings{'ACTION'} eq $Lang::tr{'reset'}) { $outfwsettings{'POLICY'}='MODE0'; unlink $configfile; - system("/bin/touch $configfile"); + system("/usr/bin/touch $configfile"); &General::writehash("${General::swroot}/outgoing/settings", \%outfwsettings); } if ($outfwsettings{'ACTION'} eq $Lang::tr{'save'}) diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 598351e7a5..3b9704ce26 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -718,7 +718,7 @@ END (my $state = $cgiparams{'ROOTCERT_STATE'}) =~ s/^\s*$/\./; # refresh - #system ('/bin/touch', "${General::swroot}/ovpn/gencanow"); + #system ('/usr/bin/touch', "${General::swroot}/ovpn/gencanow"); # Create the CA certificate my $pid = open(OPENSSL, "|-"); diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi index 65893b7abb..aeaaf5c525 100644 --- a/html/cgi-bin/pppsetup.cgi +++ b/html/cgi-bin/pppsetup.cgi @@ -1118,7 +1118,7 @@ sub updatesettings unlink("${General::swroot}/ppp/settings"); link("${General::swroot}/ppp/settings-$pppsettings{'PROFILE'}", "${General::swroot}/ppp/settings"); - system ("/bin/touch", "${General::swroot}/ppp/updatesettings"); + system ("/usr/bin/touch", "${General::swroot}/ppp/updatesettings"); 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 open(FILE, ">/${General::swroot}/eagle-usb/eagle-usb.conf") or die "Unable to write eagle-usb.conf file"; diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index 6fedf4e273..37f4600c0b 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -600,13 +600,13 @@ ERROR: unlink "${General::swroot}/proxy/transparent_blue"; 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') { - system ('/bin/touch', "${General::swroot}/proxy/transparent"); } + system ('/usr/bin/touch', "${General::swroot}/proxy/transparent"); } 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') { - 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'); } } diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi index df96a5d25c..dd449aade0 100644 --- a/html/cgi-bin/qos.cgi +++ b/html/cgi-bin/qos.cgi @@ -396,7 +396,7 @@ elsif ($qossettings{'DOTOS'} eq 'Loeschen') if ($qossettings{'ACTION'} eq 'Start') { 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("logger -t ipfire 'QoS started'"); $qossettings{'ENABLED'} = 'on'; @@ -1480,8 +1480,8 @@ sub gengraph { "LINE3:overlimits#0000FF:overlimits", "GPRINT:overlimits:LAST:overlimits\\:%8.3lf %s packets\\j", ); - $ERROR = RRDs::error; - print "$ERROR"; + $ERROR = RRDs::error; + #print "$ERROR"; } sub overviewgraph { @@ -1523,7 +1523,7 @@ sub overviewgraph { } RRDs::graph (@command); $ERROR = RRDs::error; - print "$ERROR"; + #print "$ERROR"; } sub random_hex_color { diff --git a/html/cgi-bin/remote.cgi b/html/cgi-bin/remote.cgi index 78f714f03c..ab373791b3 100644 --- a/html/cgi-bin/remote.cgi +++ b/html/cgi-bin/remote.cgi @@ -47,7 +47,7 @@ if ($remotesettings{'ACTION'} eq $Lang::tr{'save'}) { $errormessage = $Lang::tr{'ssh no auth'}; } - system ('/bin/touch', "${General::swroot}/remote/enablessh"); + system ('/usr/bin/touch', "${General::swroot}/remote/enablessh"); } else { diff --git a/html/cgi-bin/time.cgi b/html/cgi-bin/time.cgi index 9b599453b5..7fef11f468 100644 --- a/html/cgi-bin/time.cgi +++ b/html/cgi-bin/time.cgi @@ -123,7 +123,7 @@ ERROR: 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'}); unlink "${General::swroot}/time/counter"; if ($timesettings{'UPDATE_METHOD'} eq 'periodically') @@ -135,7 +135,7 @@ ERROR: } 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 } else { unlink "${General::swroot}/time/allowclients"; @@ -159,7 +159,7 @@ ERROR: $timesettings{'ACTION'} = &Header::cleanhtml ($timesettings{'ACTION'}); 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'); } diff --git a/html/cgi-bin/uptime.cgi b/html/cgi-bin/uptime.cgi index 65af6527ba..ab6eaf2ecb 100644 --- a/html/cgi-bin/uptime.cgi +++ b/html/cgi-bin/uptime.cgi @@ -50,7 +50,7 @@ if ($uptimesettings{'ACTION'} eq $Lang::tr{'save'}) elsif ($uptimesettings{'ACTION'} eq $Lang::tr{'uptime enable'}) { &save_configuration(); - system("/bin/touch ${General::swroot}/uptime/enabled"); + system("/usr/bin/touch ${General::swroot}/uptime/enabled"); system("/usr/local/bin/yasucctrl enable"); } elsif ($uptimesettings{'ACTION'} eq $Lang::tr{'uptime disable'}) diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index cf6ee7c018..ef3344bca9 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -14,7 +14,7 @@ #define CDROM_INSTALL 0 #define URL_INSTALL 1 #define DISK_INSTALL 2 -#define INST_FILECOUNT 6600 +#define INST_FILECOUNT 7000 #define UNATTENDED_CONF "/cdrom/boot/unattended.conf" int raid_disk = 0; -- 2.39.2