mirror of
https://github.com/fspc/gbootroot.git
synced 2025-02-23 00:53:23 -05:00
This uses the defaults for jffs/jffs2 properly, when nothing is added to the cli.
This commit is contained in:
parent
4553498916
commit
ff5458de18
24
expect_uml
24
expect_uml
@ -130,11 +130,11 @@ elsif ( $filesystem =~ /^mkfs\.jffs2/ ) {
|
||||
my $jffs2_name = "$root_fs_name" . "_jffs2";
|
||||
$uml->command("umount /mnt2");
|
||||
$uml->command("mount -t hostfs none -o $jffs2_dir /mnt2");
|
||||
if ( $filesystem !~ /^mkfs\.jffs2$/ ) {
|
||||
$uml->command("$filesystem -r /mnt1 -o /mnt2/$jffs2_name");
|
||||
if ( $filesystem =~ /^mkfs\.jffs2\s*$/ ) {
|
||||
$uml->command("mkfs.jffs2 -r /mnt1 -o /mnt2/$jffs2_name -e 0x20000 -p");
|
||||
}
|
||||
else {
|
||||
$uml->command("mkfs.jffs2 -r /mnt1 -o /mnt2/$jffs2_name -e 0x20000 -p");
|
||||
$uml->command("$filesystem -r /mnt1 -o /mnt2/$jffs2_name");
|
||||
}
|
||||
|
||||
}
|
||||
@ -144,23 +144,13 @@ elsif ( $filesystem =~ /^mkfs\.jffs/ ) {
|
||||
my $jffs_name = "$root_fs_name" . "_jffs";
|
||||
$uml->command("umount /mnt2");
|
||||
$uml->command("mount -t hostfs none -o $jffs_dir /mnt2");
|
||||
if ( $filesystem !~ /^mkfs\.jffs$/ ) {
|
||||
$uml->command("$filesystem -d /mnt1 -o /mnt2/$jffs_name");
|
||||
if ( $filesystem =~ /^mkfs\.jffs\s*$/ ) {
|
||||
$uml->command("mkfs.jffs2 -r /mnt1 -o /mnt2/$jffs2_name -e 0x20000 -p");
|
||||
}
|
||||
elsif {
|
||||
$uml->command("mkfs.jffs -d /mnt1 -o /mnt2/$jffs_name -e 0x20000 -p");
|
||||
else {
|
||||
$uml->command("$filesystem -r /mnt1 -o /mnt2/$jffs2_name");
|
||||
}
|
||||
}
|
||||
|
||||
$uml->command("umount /mnt1; umount /mnt2");
|
||||
$uml->halt();
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user