bike/gbootroot
1
0
Fork 0
mirror of https://github.com/fspc/gbootroot.git synced 2025-02-23 09:03:23 -05:00
Code Issues Projects Releases Wiki Activity

The non-root saga continues.

Browse Source
This commit is contained in:
freesource 2001-10-18 05:17:50 +00:00
parent cf9f91863b
commit fed9b6c6cd
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
BootRoot/Yard.pm
View File

@ -1097,17 +1097,23 @@ sub copy_strip_file {
## non-root users will experience problems here so this is ## non-root users will experience problems here so this is
## skipped. --freesource ## skipped. --freesource
my($mode, $uid, $gid);
(undef, undef, $mode, undef, $uid, $gid) = stat $from;
my $from_base = basename($from);
if ( $> == 0 ) { if ( $> == 0 ) {
my($mode, $uid, $gid);
(undef, undef, $mode, undef, $uid, $gid) = stat $from;
my $from_base = basename($from);
chown($uid, $gid, $to) or ($error = chown($uid, $gid, $to) or ($error =
error("chown: $! \($from_base\)\n")); error("chown: $! \($from_base\)\n"));
return "ERROR"if $error && $error eq "ERROR"; return "ERROR"if $error && $error eq "ERROR";
chmod($mode, $to) or ($error = chmod($mode, $to) or ($error =
error("chmod: $! \($from_base\)\n")); error("chmod: $! \($from_base\)\n"));
return "ERROR"if $error && $error eq "ERROR"; return "ERROR"if $error && $error eq "ERROR";
} }
else {
sys("$main::sudo chown $uid $gid $to");
sys("$main::sudo chmod $mode $to");
}
} }
else { else {

17
gbootroot
View File

@ -129,7 +129,7 @@ my $home = "$ENV{HOME}/.gbootroot";
my $uml_xterm = "xterm -e"; my $uml_xterm = "xterm -e";
$main::editor = "emacs --font 6x13"; $main::editor = "emacs --font 6x13";
$main::makefs = "mke2fs -F -m0 -i8192"; # Root Disk $main::makefs = "mke2fs -F -m0 -i8192"; # Root Disk
my $sudo = "sudo"; $main::sudo = "sudo";
# CHANGES # CHANGES
# #
@ -538,7 +538,7 @@ else {
# auto defaults,noauto,user,loop 0 0 # auto defaults,noauto,user,loop 0 0
# #
# For the boot/root disks the administrator will have to give the user # For the boot/root disks the administrator will have to give the user
# special su privileges (mknod) to make special devices. The $sudo # special su privileges (mknod) to make special devices. The $main::sudo
# variable can be set to sudo or super, fakeroot won't work. # variable can be set to sudo or super, fakeroot won't work.
# These include: /dev/{console,null,ram0,ram1,tty0} # These include: /dev/{console,null,ram0,ram1,tty0}
# These two lines need to be added to create the boot_fs and the boot/root # These two lines need to be added to create the boot_fs and the boot/root
@ -566,6 +566,7 @@ else {
"mkdir $tmp1/gboot_non_root_mnt_" . $user, "mkdir $tmp1/gboot_non_root_mnt_" . $user,
"gBootRoot: ERROR: Could not make mount directory") != 2; "gBootRoot: ERROR: Could not make mount directory") != 2;
} }
$mnt = "$tmp1/gboot_non_root_mnt" . $user;
} }
@ -3114,12 +3115,12 @@ sub initrd {
} }
else { else {
# This could be replaced by a devfs. # This could be replaced by a devfs.
sys("$sudo mknod c 5 1 $tmp/initrd_mnt/dev/console"); sys("$main::sudo mknod c 5 1 $tmp/initrd_mnt/dev/console");
sys("$sudo mknod c 1 3 $tmp/initrd_mnt/dev/null"); sys("$main::sudo mknod c 1 3 $tmp/initrd_mnt/dev/null");
sys("$sudo mknod b 1 0 $tmp/initrd_mnt/dev/ram0"); sys("$main::sudo mknod b 1 0 $tmp/initrd_mnt/dev/ram0");
sys("$sudo mknod b 1 1 $tmp/initrd_mnt/dev/ram1"); sys("$main::sudo mknod b 1 1 $tmp/initrd_mnt/dev/ram1");
sys("$sudo mknod c 4 0 $tmp/initrd_mnt/dev/tty0"); sys("$main::sudo mknod c 4 0 $tmp/initrd_mnt/dev/tty0");
sys("$sudo mknod b 2 0 $tmp/initrd_mnt/dev/fd0"); sys("$main::sudo mknod b 2 0 $tmp/initrd_mnt/dev/fd0");
} }
pb($I,7); pb($I,7);