fix vncpassword, log the exception (#104056)

1 files changed, 3 insertions, 7 deletions

diff --git a/anaconda b/anaconda
index 04437168d..c2293a25a 100755
--- a/anaconda
+++ b/anaconda
@@ -79,11 +79,6 @@ def startVNCServer(vncpassword=None, root='/', vncconnecthost=None,
 	# write password again
 	os.write(fd, passwd + "\n")
 
-	# write out a 'n\n' to answer question about creating a view only pw
-	os.read(fd, 1000)
-	os.read(fd, 1000)
-	os.write(fd, "n\n")
-        
 	# read remaining output
 	os.read(fd, 1000)
 
@@ -147,8 +142,9 @@ def startVNCServer(vncpassword=None, root='/', vncconnecthost=None,
 	if vncpassword is not None:
 	    try:
 		rc = set_vnc_password(root, vncpassword, "/tmp/vncpasswd_file")
-	    except:
-		dup_log("Unknown expection setting vnc password.")
+	    except Exception, e:
+		dup_log("Unknown exception setting vnc password.")
+                log("Exception was: %s" %(e,))
 		rc = 1
 
 	    if rc: