mirror of
https://github.com/fspc/gbootroot.git
synced 2025-02-22 08:33:24 -05:00
* I will have to look at the diff. :)
This commit is contained in:
parent
b52c3d4366
commit
4c71a920b0
29
gBootRoot
29
gBootRoot
@ -945,6 +945,10 @@ sub advanced_kernel_section {
|
|||||||
|
|
||||||
} # end sub advanced_kernel_section
|
} # end sub advanced_kernel_section
|
||||||
|
|
||||||
|
# Stuff univeral for all root filesystem methods
|
||||||
|
# Compression, UML Kernel, and Method only need to be known by the Dock.
|
||||||
|
|
||||||
|
|
||||||
sub Generate {
|
sub Generate {
|
||||||
|
|
||||||
# @entry_advanced
|
# @entry_advanced
|
||||||
@ -955,23 +959,20 @@ sub Generate {
|
|||||||
# 3 = Root Device
|
# 3 = Root Device
|
||||||
# 4 = Root Filename
|
# 4 = Root Filename
|
||||||
# 5 = UML Kernel
|
# 5 = UML Kernel
|
||||||
# 6 = Method
|
$method = $entry_advanced[6]; # 6 = Method
|
||||||
$method = $entry_advanced[6];
|
|
||||||
# 7 = Template
|
# 7 = Template
|
||||||
# $root_device_size;
|
# $root_device_size;
|
||||||
# $filesystem_size;
|
# $filesystem_size;
|
||||||
|
|
||||||
# Stuff univeral for all root filesystem methods
|
my $ars = { "device" => $entry_advanced[3],
|
||||||
# Compression, UML Kernel, and Method only need to be known by the Dock.
|
"device_size" => $root_device_size,
|
||||||
my $ars = { "device" => $entry_advanced[3],
|
"filename" => $entry_advanced[4],
|
||||||
"device_size" => $root_device_size,
|
"filesystem_size" => $filesystem_size,
|
||||||
"filename" => $entry_advanced[4],
|
"kernel" => $container[1],
|
||||||
"filesystem_size" => $filesystem_size,
|
"template_directory" => $template_dir,
|
||||||
"kernel" => $container[1],
|
"template" => $entry_advanced[7],
|
||||||
"template_directory" => $template_dir,
|
"tmp" => $tmp,
|
||||||
"template" => $entry_advanced[7],
|
"mnt" => $mnt
|
||||||
"tmp" => $tmp,
|
|
||||||
"mnt" => $mnt
|
|
||||||
};
|
};
|
||||||
|
|
||||||
my $template = $ars->{template};
|
my $template = $ars->{template};
|
||||||
@ -1938,7 +1939,7 @@ sub initrd {
|
|||||||
if (!-d "$tmp/initrd_mnt") {
|
if (!-d "$tmp/initrd_mnt") {
|
||||||
return if errmk(sys("mkdir $tmp/initrd_mnt")) == 2;
|
return if errmk(sys("mkdir $tmp/initrd_mnt")) == 2;
|
||||||
}
|
}
|
||||||
return if errmk(sys("mount -o loop -t ext2 $tmp/$initrd $tmp/initrd_mnt"))
|
return if errm(sys("mount -o loop -t ext2 $tmp/$initrd $tmp/initrd_mnt"))
|
||||||
== 2;
|
== 2;
|
||||||
pb($I,4);
|
pb($I,4);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user