From 119cd3aface4e3a3976331da5e427b1ebe9432e6 Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Sat, 2 Jun 2007 22:21:01 +0000 Subject: [PATCH] Close STDIN ($fp) handle before returning back to shell. Major doh's. --- etc/inc/config.inc | 5 ++++- etc/rc.initial.store_config_to_removable_device | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/etc/inc/config.inc b/etc/inc/config.inc index a8e39503d1..81e0ad03e6 100644 --- a/etc/inc/config.inc +++ b/etc/inc/config.inc @@ -1308,6 +1308,7 @@ EOD; echo "\nEnter the LAN interface name or 'a' for auto-detection: "; $lanif = chop(fgets($fp)); if ($lanif === "") { + fclose($fp); return; } @@ -1381,7 +1382,7 @@ EOD; Error: you cannot assign the same interface name twice! EOD; - + fclose($fp); return; } } @@ -1453,6 +1454,8 @@ EOD; EOD; + fclose($fp); + if($g['booting']) return; diff --git a/etc/rc.initial.store_config_to_removable_device b/etc/rc.initial.store_config_to_removable_device index 8a74fcd656..8733e980c5 100755 --- a/etc/rc.initial.store_config_to_removable_device +++ b/etc/rc.initial.store_config_to_removable_device @@ -85,5 +85,5 @@ echo "done.\n"; echo "\nYour configuration has been moved to {$move_config_to_device}\n"; touch("/tmp/config_moved"); - + fclose($fp); ?> \ No newline at end of file