mirror of
				https://github.com/fspc/gbootroot.git
				synced 2025-11-04 08:15:36 -05:00 
			
		
		
		
	Just a close thingy.
This commit is contained in:
		
							parent
							
								
									c5041cd18e
								
							
						
					
					
						commit
						600d6d856f
					
				@ -1674,7 +1674,6 @@ sub which_tests {
 | 
			
		||||
    my ($chosen_tests) = @_;
 | 
			
		||||
    my ($action, $label);
 | 
			
		||||
 | 
			
		||||
    return "ERROR" if errm(mount_device($device,$mount_point)) == 2;
 | 
			
		||||
 | 
			
		||||
    #  This is a little crude.  Technically we should read /etc/conf.getty
 | 
			
		||||
    #  to make sure we're not supposed to be using a different login binary.
 | 
			
		||||
@ -1699,6 +1698,8 @@ sub which_tests {
 | 
			
		||||
    sys("yard_chrooted_tests $mount_point $t_fstab $t_inittab $t_scripts",
 | 
			
		||||
	"TESTING"); 
 | 
			
		||||
 | 
			
		||||
    return "ERROR" if errm(mount_device($device,$mount_point)) == 2;
 | 
			
		||||
 | 
			
		||||
    # Now the question is whether or not these next tests depend on
 | 
			
		||||
    # chroot, since they must have before.
 | 
			
		||||
    if ( $chosen_tests->{33}{test_links}   == 1 ) {
 | 
			
		||||
@ -1720,6 +1721,7 @@ sub which_tests {
 | 
			
		||||
 | 
			
		||||
    return "ERROR" if errum(sys("umount $mount_point")) == 2;
 | 
			
		||||
 | 
			
		||||
    
 | 
			
		||||
} # end sub which_tests
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -1900,7 +1902,7 @@ sub check_nss {
 | 
			
		||||
	    }
 | 
			
		||||
	 }
 | 
			
		||||
      }
 | 
			
		||||
 | 
			
		||||
      close(NSS) or error("Closing NSS: $!");
 | 
			
		||||
   } else {
 | 
			
		||||
      #  No nsswitch.conf is present, figure out if maybe there should be one.
 | 
			
		||||
      if (-e $login_binary) {
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user