mirror of
				https://github.com/fspc/gbootroot.git
				synced 2025-11-04 00:05:35 -05:00 
			
		
		
		
	Provides default behavior, and user defined which over-rides.
This commit is contained in:
		
							parent
							
								
									d2fb7540f3
								
							
						
					
					
						commit
						9c2a97b875
					
				
							
								
								
									
										20
									
								
								expect_uml
									
									
									
									
									
								
							
							
						
						
									
										20
									
								
								expect_uml
									
									
									
									
									
								
							@ -99,12 +99,15 @@ if ( $filesystem =~ /^mkcramfs/ || $filesystem =~ /^genromfs/ ||
 | 
				
			|||||||
else {
 | 
					else {
 | 
				
			||||||
    $uml->command("$filesystem /dev/ubd/1");
 | 
					    $uml->command("$filesystem /dev/ubd/1");
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
$uml->command("mount /dev/ubd/1 /mnt1");
 | 
					$uml->command("mount /dev/ubd/1 /mnt1");
 | 
				
			||||||
$uml->command("mount -t hostfs none -o $mount_point /mnt2");
 | 
					$uml->command("mount -t hostfs none -o $mount_point /mnt2");
 | 
				
			||||||
$uml->command("cp -a /mnt2/* /mnt1");
 | 
					$uml->command("cp -a /mnt2/* /mnt1");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if ( $preserve_ownership == 0 ) {
 | 
					if ( $preserve_ownership == 0 ) {
 | 
				
			||||||
    $uml->command("chown -R 0:0 /mnt1");
 | 
					    $uml->command("chown -R 0:0 /mnt1");
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if ( $filesystem =~ /^mkcramfs/ ) {
 | 
					if ( $filesystem =~ /^mkcramfs/ ) {
 | 
				
			||||||
    my $cram_dir = dirname($mount_point);
 | 
					    my $cram_dir = dirname($mount_point);
 | 
				
			||||||
    my $root_fs_name = basename($ARGV[1]);
 | 
					    my $root_fs_name = basename($ARGV[1]);
 | 
				
			||||||
@ -127,7 +130,13 @@ elsif ( $filesystem =~ /^mkfs\.jffs2/ ) {
 | 
				
			|||||||
    my $jffs2_name = "$root_fs_name" . "_jffs2";
 | 
					    my $jffs2_name = "$root_fs_name" . "_jffs2";
 | 
				
			||||||
    $uml->command("umount /mnt2");
 | 
					    $uml->command("umount /mnt2");
 | 
				
			||||||
    $uml->command("mount -t hostfs none -o $jffs2_dir /mnt2");
 | 
					    $uml->command("mount -t hostfs none -o $jffs2_dir /mnt2");
 | 
				
			||||||
    $uml->command("mkfs.jffs2 -r /mnt1 -o /mnt2/$jffs2_name  -e 0x20000 -p");
 | 
					    if ( $filesystem !~ /^mkfs\.jffs2$/ ) {
 | 
				
			||||||
 | 
						$uml->command("$filesystem -r /mnt1 -o /mnt2/$jffs2_name");
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    else {
 | 
				
			||||||
 | 
						$uml->command("mkfs.jffs2 -r /mnt1 -o /mnt2/$jffs2_name  -e 0x20000 -p");
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
elsif ( $filesystem =~ /^mkfs\.jffs/ ) {
 | 
					elsif ( $filesystem =~ /^mkfs\.jffs/ ) {
 | 
				
			||||||
    my $jffs_dir = dirname($mount_point);
 | 
					    my $jffs_dir = dirname($mount_point);
 | 
				
			||||||
@ -135,7 +144,12 @@ elsif ( $filesystem =~ /^mkfs\.jffs/ ) {
 | 
				
			|||||||
    my $jffs_name = "$root_fs_name" . "_jffs";
 | 
					    my $jffs_name = "$root_fs_name" . "_jffs";
 | 
				
			||||||
    $uml->command("umount /mnt2");
 | 
					    $uml->command("umount /mnt2");
 | 
				
			||||||
    $uml->command("mount -t hostfs none -o $jffs_dir /mnt2");
 | 
					    $uml->command("mount -t hostfs none -o $jffs_dir /mnt2");
 | 
				
			||||||
    $uml->command("mkfs.jffs -d /mnt1 -o /mnt2/$jffs_name  -e 0x20000 -p");
 | 
					    if ( $filesystem !~ /^mkfs\.jffs$/ ) {
 | 
				
			||||||
 | 
						$uml->command("$filesystem -d /mnt1 -o /mnt2/$jffs_name");
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    elsif {
 | 
				
			||||||
 | 
						$uml->command("mkfs.jffs -d /mnt1 -o /mnt2/$jffs_name  -e 0x20000 -p");
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
$uml->command("umount /mnt1; umount /mnt2");   
 | 
					$uml->command("umount /mnt1; umount /mnt2");   
 | 
				
			||||||
@ -148,3 +162,5 @@ $uml->halt();
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user