Thu Dec 6 16:32:00 UTC 2007 Richard W.M. Jones <rjones@redhat.com>

	* src/virsh.c: The prompt should depend on readonly status,
	  not on the UID.

diff --git a/ChangeLog b/ChangeLog
index a512758e296111730a481c197384f7919f39fa9c..36cfa68b5cd32a9749b7438e484482cda97e6247 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec  6 16:32:00 UTC 2007 Richard W.M. Jones <rjones@redhat.com>
+
+       * src/virsh.c: The prompt should depend on readonly status,
+         not on the UID.
+
 Thu Dec  6 16:30:00 UTC 2007 Richard W.M. Jones <rjones@redhat.com>
 
        * configure.in, qemud/Makefile.am: Added a --without-libvirtd

diff --git a/src/virsh.c b/src/virsh.c
index 3486d463b610a901040bfac30c5ccf95a84f2d51..92fef77a5c124ba3dd232345a8a07f9722514efc 100644 (file)
--- a/src/virsh.c
+++ b/src/virsh.c
@@ -5054,8 +5054,9 @@ main(int argc, char **argv)
         }
         vshReadlineInit();
         do {
+            const char *prompt = ctl->readonly ? VSH_PROMPT_RO : VSH_PROMPT_RW;
             ctl->cmdstr =
-                vshReadline(ctl, ctl->uid == 0 ? VSH_PROMPT_RW : VSH_PROMPT_RO);
+                vshReadline(ctl, prompt);
             if (ctl->cmdstr == NULL)
                 break;          /* EOF */
             if (*ctl->cmdstr) {