bike
/
gbootroot
mirror of https://github.com/fspc/gbootroot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

perm changes for BootRoot, comment in Yard.

master
freesource 23 years ago
parent
846adeb29d
commit
08999ef628
2 changed files with 10 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      BootRoot/BootRoot.pm
  2. 7
      BootRoot/Yard.pm

7
BootRoot/BootRoot.pm
View File

@ -1052,6 +1052,7 @@ sub advanced_root_section {
$ear2->set_text("root_fs") if !$entry_advanced[4]; $ear2->set_text("root_fs") if !$entry_advanced[4];
$ars->{filename} = "root_fs" if !$entry_advanced[4]; $ars->{filename} = "root_fs" if !$entry_advanced[4];
$ear2->set_text($entry_advanced[4]) if $entry_advanced[4]; $ear2->set_text($entry_advanced[4]) if $entry_advanced[4];
root_filename($ear2);
$ars->{filename} = $entry_advanced[4] if $entry_advanced[4]; $ars->{filename} = $entry_advanced[4] if $entry_advanced[4];
ars($ars); ars($ars);
$tooltips->set_tip( $ear2, "Give the Root Filesystem file a name.", $tooltips->set_tip( $ear2, "Give the Root Filesystem file a name.",
@ -3405,7 +3406,7 @@ sub initrd {
} }
print LC initrd_heredoc($broot_image,$device); close(LC); print LC initrd_heredoc($broot_image,$device); close(LC);
# I could test this but somebody's system may do permissions differently # I could test this but somebody's system may do permissions differently
sys("chmod 755 $tmp/initrd_mnt/linuxrc"); sys("chmod 0755 $tmp/initrd_mnt/linuxrc");
if ($fs_type ne "genext2fs" ) { if ($fs_type ne "genext2fs" ) {
sys("rmdir $tmp/initrd_mnt/lost+found"); sys("rmdir $tmp/initrd_mnt/lost+found");
} }
@ -3641,13 +3642,13 @@ sub initrd {
mkpath("$tmp/initrd_mnt/usr/i386-linux-uclibc/lib"); mkpath("$tmp/initrd_mnt/usr/i386-linux-uclibc/lib");
$path = "/usr/i386-linux-uclibc/lib/libuClibc-0.9.5.so"; $path = "/usr/i386-linux-uclibc/lib/libuClibc-0.9.5.so";
return if errcp(sys("$tool $path $tmp/initrd_mnt/usr/i386-linux-uclibc/lib")) == 2; return if errcp(sys("$tool $path $tmp/initrd_mnt/usr/i386-linux-uclibc/lib")) == 2;
sys("chmod 755 $tmp/initrd_mnt/usr/i386-linux-uclibc/lib/libuClibc-0.9.5.so"); sys("chmod 0755 $tmp/initrd_mnt/usr/i386-linux-uclibc/lib/libuClibc-0.9.5.so");
chdir("$tmp/initrd_mnt/lib"); chdir("$tmp/initrd_mnt/lib");
symlink("../usr/i386-linux-uclibc/lib/libuClibc-0.9.5.so", "$tmp/initrd_mnt/lib/libc.so.0" ); symlink("../usr/i386-linux-uclibc/lib/libuClibc-0.9.5.so", "$tmp/initrd_mnt/lib/libc.so.0" );
$path = "/usr/i386-linux-uclibc/lib/ld-uClibc-0.9.5.so"; $path = "/usr/i386-linux-uclibc/lib/ld-uClibc-0.9.5.so";
return if errcp(sys("$tool $path $tmp/initrd_mnt/usr/i386-linux-uclibc/lib")) == 2; return if errcp(sys("$tool $path $tmp/initrd_mnt/usr/i386-linux-uclibc/lib")) == 2;
sys("chmod 755 $tmp/initrd_mnt/usr/i386-linux-uclibc/lib/ld-uClibc-0.9.5.so"); sys("chmod 0755 $tmp/initrd_mnt/usr/i386-linux-uclibc/lib/ld-uClibc-0.9.5.so");
chdir("$tmp/initrd_mnt/usr/i386-linux-uclibc/lib"); chdir("$tmp/initrd_mnt/usr/i386-linux-uclibc/lib");
symlink("ld-uClibc-0.9.5.so", "$tmp/initrd_mnt/usr/i386-linux-uclibc/lib/ld-uClibc.so.0" ); symlink("ld-uClibc-0.9.5.so", "$tmp/initrd_mnt/usr/i386-linux-uclibc/lib/ld-uClibc.so.0" );

7
BootRoot/Yard.pm
View File

@ -1419,9 +1419,14 @@ sub create_filesystem {
} }
if ( $fs_type eq "mkcramfs" ) { if ( $fs_type eq "mkcramfs" ) {
# Will just keep appending _cramfs .. leaving it to the
# user to realize this is happening, that way the user
# has control over the dd file.
$device = $device . "_cramfs"; $device = $device . "_cramfs";
my $cramfs_name = basename($device); my $cramfs_name = basename($device);
$ear2->set_text($cramfs_name); # If somebody closes ARS, this won't get updated,
# but that is a minor matter.
$ear2->set_text($cramfs_name) if $ear2;
$mount_point = dirname($device); $mount_point = dirname($device);
} }

Write Preview
Loading…
Cancel
Save