Minor fix in config parser - previously we silently discarded all lines

in network- and custom- config sections not beginning with a <TAB>
character, now it is allowed for entries in those sections to start
right at column 0.

Remove another Tk polluting line from exec.tcl

Bug found by:
Submitted by:
Requested by:
Reviewed by:
Approved by:
Obtained from:

diff --git a/cfgparse.tcl b/cfgparse.tcl
index 5b06b51b11d05310c31bdec1d00315594c00dcc0..3aed419b3a130f98b460e2762a2bb6ae2a5ef27d 100755 (executable)
--- a/cfgparse.tcl
+++ b/cfgparse.tcl
@@ -188,9 +188,10 @@ proc loadCfg { cfg } {
                            foreach zline [split $value {\r}] {
                                if { [string index "$zline" 0] == "     " } {
                                    set zline [string replace "$zline" 0 0]
-                                   lappend cfg $zline
                                }
+                               lappend cfg $zline
                            }
+                           set cfg [lrange $cfg 1 [expr [llength $cfg] - 2]]
                            lappend $object "network-config {$cfg}"
                        }
                        custom-enabled {
@@ -204,9 +205,10 @@ proc loadCfg { cfg } {
                            foreach zline [split $value {\r}] {
                                if { [string index "$zline" 0] == "     " } {
                                    set zline [string replace "$zline" 0 0]
-                                   lappend cfg $zline
                                }
+                               lappend cfg $zline
                            }
+                           set cfg [lrange $cfg 1 [expr [llength $cfg] - 2]]
                            lappend $object "custom-config {$cfg}"
                        }
                        iconcoords {

diff --git a/exec.tcl b/exec.tcl
index eb5909a88c98f7fcd782ec971b479e946f8b9798..dff4ddf186bdbc3b29204ac371f0611c788830b1 100755 (executable)
--- a/exec.tcl
+++ b/exec.tcl
@@ -332,7 +332,6 @@ proc vimageCleanup {} {
     catch { nexec rm -f /usr/local/xorp/config.boot }
     catch { nexec mv /etc/resolv.conf.bak /etc/resolv.conf }
     statline "Cleanup completed in [expr [clock seconds] - $t_start] seconds."
-    .c config -cursor left_ptr
 }