mirror of
				https://github.com/fspc/gbootroot.git
				synced 2025-10-31 15:45:36 -04:00 
			
		
		
		
	Added cad "Ctrl-Alt-Del" to mconsole interface, and documented it.
Now looks for mconsole at both old location /tmp/uml/$umid/mconsole and
new location $ENV{HOME}/.uml/$umid/mconsole.
			
			
This commit is contained in:
		
							parent
							
								
									93b5f23410
								
							
						
					
					
						commit
						896f2a9519
					
				| @ -52,8 +52,8 @@ my $uml_xterm = "xterm -e"; | |||||||
| # and to update scripts/Debian.yard if | # and to update scripts/Debian.yard if | ||||||
| # make_debian has been changed, | # make_debian has been changed, | ||||||
| # and to install -s linux. | # and to install -s linux. | ||||||
| my $version = "1.3.4"; | my $version = "1.3.5"; | ||||||
| my $date = "02.08.2002"; | my $date = "02.13.2002"; | ||||||
| my $gtk_perl_version = "0.7002"; | my $gtk_perl_version = "0.7002"; | ||||||
| my $pwd = `pwd`; chomp $pwd; | my $pwd = `pwd`; chomp $pwd; | ||||||
| my $home_rootfs = "$home/root_filesystem/"; | my $home_rootfs = "$home/root_filesystem/"; | ||||||
| @ -1341,7 +1341,7 @@ sub uml_box { | |||||||
| 	$tooltips->set_tip( $eab4,  | 	$tooltips->set_tip( $eab4,  | ||||||
|                            "Pass commands to the mconsole.\n" . |                            "Pass commands to the mconsole.\n" . | ||||||
| 			    "1.  sysrq [0-9|b|e|i|l|m|p|r|s|t|u]  \n" .  | 			    "1.  sysrq [0-9|b|e|i|l|m|p|r|s|t|u]  \n" .  | ||||||
| 			    "2.  reboot   halt   \n" . | 			    "2.  cad   reboot   halt   \n" . | ||||||
| 			    "3.  config <dev>=<config>\n4.  remove <dev>\n" . | 			    "3.  config <dev>=<config>\n4.  remove <dev>\n" . | ||||||
| 			    "5.  switch <umid>\n6.  version   help", | 			    "5.  switch <umid>\n6.  version   help", | ||||||
|                            "" ); |                            "" ); | ||||||
| @ -1356,6 +1356,38 @@ sub uml_box { | |||||||
| 						[14]); | 						[14]); | ||||||
| 		       | 		       | ||||||
| 
 | 
 | ||||||
|  | 		      # Figure out whether it's an old mconsole location | ||||||
|  | 		      # or new. | ||||||
|  | 
 | ||||||
|  | 		      my $umid_location = "/tmp/uml//mconsole"; | ||||||
|  | 		      if ( -S "/tmp/uml/$umid/mconsole" ) { | ||||||
|  | 			  $umid_location = "/tmp/uml/$umid/mconsole"; | ||||||
|  | 		      } | ||||||
|  | 		      elsif ( -S "$ENV{HOME}/.uml/$umid/mconsole" ) { | ||||||
|  | 			  $umid_location = "$ENV{HOME}/.uml/$umid/mconsole"; | ||||||
|  | 		      } | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  |  		      # cad | ||||||
|  | 		      if ( $entry_advanced[14] &&  | ||||||
|  | 			   $entry_advanced[14] =~ m,cad, ) { | ||||||
|  | 			  for my $co (0 ..  $#command_parts ) { | ||||||
|  | 			      if ( $command_parts[$co] eq  | ||||||
|  | 				   "cad" | ||||||
|  | 				   )  | ||||||
|  | 			      { | ||||||
|  | 				  sys(  | ||||||
|  | 				       "uml_mconsole " . | ||||||
|  | 				      $umid_location . | ||||||
|  | 				       " cad"); | ||||||
|  | 				   | ||||||
|  | 			      } | ||||||
|  | 			       | ||||||
|  | 			  } | ||||||
|  | 			   | ||||||
|  | 		      } | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  		      # help |  		      # help | ||||||
| 		      if ( $entry_advanced[14] &&  | 		      if ( $entry_advanced[14] &&  | ||||||
| 			   $entry_advanced[14] =~ m,help, ) { | 			   $entry_advanced[14] =~ m,help, ) { | ||||||
| @ -1366,7 +1398,7 @@ sub uml_box { | |||||||
| 			      { | 			      { | ||||||
| 				  sys(  | 				  sys(  | ||||||
| 				       "uml_mconsole " . | 				       "uml_mconsole " . | ||||||
| 				       "/tmp/uml/$umid/mconsole" . | 				      $umid_location . | ||||||
| 				       " help"); | 				       " help"); | ||||||
| 				   | 				   | ||||||
| 			      } | 			      } | ||||||
| @ -1387,7 +1419,7 @@ sub uml_box { | |||||||
| 			      { | 			      { | ||||||
| 				  sys(  | 				  sys(  | ||||||
| 				       "uml_mconsole " . | 				       "uml_mconsole " . | ||||||
| 				       "/tmp/uml/$umid/mconsole" . | 				      $umid_location . | ||||||
| 				       " version"); | 				       " version"); | ||||||
| 				   | 				   | ||||||
| 			      } | 			      } | ||||||
| @ -1408,7 +1440,7 @@ sub uml_box { | |||||||
| 			      { | 			      { | ||||||
| 				  system | 				  system | ||||||
| 				       "uml_mconsole " . | 				       "uml_mconsole " . | ||||||
| 				       "/tmp/uml/$umid/mconsole" . | 				      $umid_location . | ||||||
| 				       " reboot&"; | 				       " reboot&"; | ||||||
| 				   | 				   | ||||||
| 			      } | 			      } | ||||||
| @ -1427,7 +1459,7 @@ sub uml_box { | |||||||
| 			      { | 			      { | ||||||
| 				  system | 				  system | ||||||
| 				       "uml_mconsole " . | 				       "uml_mconsole " . | ||||||
| 				       "/tmp/uml/$umid/mconsole" . | 				      $umid_location . | ||||||
| 				       " halt&"; | 				       " halt&"; | ||||||
| 				   | 				   | ||||||
| 			      } | 			      } | ||||||
| @ -1450,13 +1482,13 @@ sub uml_box { | |||||||
| 				       ^m$ | ^p$ | ^r$ | ^s$ | ^t$ | ^u$,x ) { | 				       ^m$ | ^p$ | ^r$ | ^s$ | ^t$ | ^u$,x ) { | ||||||
| 				      system | 				      system | ||||||
| 					  "uml_mconsole " .  | 					  "uml_mconsole " .  | ||||||
| 					      "/tmp/uml/$umid/mconsole" . | 					     $umid_location . | ||||||
| 					  " sysrq $command_parts[$co + 1]&"; | 					  " sysrq $command_parts[$co + 1]&"; | ||||||
| 				  } | 				  } | ||||||
| 				  else { | 				  else { | ||||||
| 				      system | 				      system | ||||||
| 					  "uml_mconsole " .  | 					  "uml_mconsole " .  | ||||||
| 					      "/tmp/uml/$umid/mconsole" . | 					     $umid_location . | ||||||
| 					  " sysrq&"; | 					  " sysrq&"; | ||||||
| 				  } | 				  } | ||||||
| 			   | 			   | ||||||
| @ -1478,7 +1510,7 @@ sub uml_box { | |||||||
| 
 | 
 | ||||||
| 				  sys( | 				  sys( | ||||||
| 				      "uml_mconsole " .  | 				      "uml_mconsole " .  | ||||||
| 					  "/tmp/uml/$umid/mconsole" . | 					 $umid_location . | ||||||
| 					  " switch $command_parts[$co + 1]"); | 					  " switch $command_parts[$co + 1]"); | ||||||
| 			   | 			   | ||||||
| 				  $umid = $command_parts[$co + 1]; | 				  $umid = $command_parts[$co + 1]; | ||||||
| @ -1501,7 +1533,7 @@ sub uml_box { | |||||||
| 			      { | 			      { | ||||||
| 				  system | 				  system | ||||||
| 				      "uml_mconsole " . | 				      "uml_mconsole " . | ||||||
| 					  "/tmp/uml/$umid/mconsole" . | 					 $umid_location . | ||||||
| 					      " config " . | 					      " config " . | ||||||
| 						  "$command_parts[$co + 1]&"; | 						  "$command_parts[$co + 1]&"; | ||||||
|   |   | ||||||
| @ -1522,7 +1554,7 @@ sub uml_box { | |||||||
| 			      { | 			      { | ||||||
| 				  system  | 				  system  | ||||||
| 				      "uml_mconsole " . | 				      "uml_mconsole " . | ||||||
| 					  "/tmp/uml/$umid/mconsole" . | 					 $umid_location . | ||||||
| 					      " remove " . | 					      " remove " . | ||||||
| 						  "$command_parts[$co + 1]&"; | 						  "$command_parts[$co + 1]&"; | ||||||
| 				   | 				   | ||||||
|  | |||||||
							
								
								
									
										4
									
								
								Changes
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								Changes
									
									
									
									
									
								
							| @ -1,3 +1,7 @@ | |||||||
|  | Added cad "Ctrl-Alt-Del" to mconsole interface, and documented it. | ||||||
|  | 
 | ||||||
|  | Now looks for mconsole at both old location /tmp/uml/$umid/mconsole and | ||||||
|  | new location $ENV{HOME}/.uml/$umid/mconsole. | ||||||
| 
 | 
 | ||||||
| Now files for uml_exclusively are made in create_expect_uml which is | Now files for uml_exclusively are made in create_expect_uml which is | ||||||
| effectively known as the create stage.  This avoids the unecessary previous  | effectively known as the create stage.  This avoids the unecessary previous  | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user