diff --git a/www/showimageid_list.php3 b/www/showimageid_list.php3
index ea3900465f59f32a72f4578aa502ef97170830dd..259c837e028abb80c4bbe5b07292064bddda92af 100644
--- a/www/showimageid_list.php3
+++ b/www/showimageid_list.php3
@@ -62,11 +62,28 @@ SUBPAGESTART();
SUBMENUSTART("More Options");
WRITESUBMENUBUTTON("Create an Image Descriptor",
"newimageid_ez.php3");
-WRITESUBMENUBUTTON("Create an OS Descriptor",
- "newosid_form.php3");
+if ($isadmin) {
+ WRITESUBMENUBUTTON("Create an OS Descriptor",
+ "newosid_form.php3");
+}
WRITESUBMENUBUTTON("OS Descriptor list",
"showosid_list.php3");
SUBMENUEND();
+
+echo "Listed below are the Images that you can load on your nodes with the
+
+ tb-set-node-os directive. If the OS you have selected for
+ a node is not loaded on that node when the experiment is swapped in,
+ the Testbed system will automatically reload that node's disk with the
+ appropriate image. You might notice that it takes a few minutes longer
+ to start start your experiment when selecting an OS that is not
+ already resident. Please be patient.
+
+ More information on how to create your own Images is in the
+ Custom OS section of
+ the Emulab Tutorial.
+
\n";
+
SUBPAGEEND();
if (mysql_num_rows($query_result)) {
diff --git a/www/showosid_list.php3 b/www/showosid_list.php3
index ab34ae4841e92ec0349126390efabb74cf850cd3..03768137c2b92377a2883bb02443d583eb0f329a 100644
--- a/www/showosid_list.php3
+++ b/www/showosid_list.php3
@@ -56,14 +56,15 @@ SUBPAGESTART();
SUBMENUSTART("More Options");
WRITESUBMENUBUTTON("Create an Image Descriptor",
"newimageid_ez.php3");
-WRITESUBMENUBUTTON("Create an OS Descriptor",
- "newosid_form.php3");
+if ($isadmin) {
+ WRITESUBMENUBUTTON("Create an OS Descriptor",
+ "newosid_form.php3");
+}
WRITESUBMENUBUTTON("Image Descriptor list",
"showimageid_list.php3");
SUBMENUEND();
-echo "
- Listed below are the OS Descriptors that you may use in your NS file +echo "Listed below are the OS Descriptors that you may use in your NS file with the tb-set-node-os directive. If the OS you have selected for a node is not loaded on that node when the experiment is swapped in, @@ -71,7 +72,11 @@ echo "
appropriate image. You might notice that it takes a few minutes longer to start start your experiment when selecting an OS that is not already resident. Please be patient. -