diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile | 2 | ||||
| -rwxr-xr-x | tools/drakx-in-chroot | 13 | ||||
| -rwxr-xr-x | tools/install-xml-file-list | 4 |
3 files changed, 16 insertions, 3 deletions
diff --git a/tools/Makefile b/tools/Makefile index 669b6f987..1d9d5d736 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -10,7 +10,7 @@ endif .PHONY: clean install $(DIRS) -all: $(DIRS) xhost+ rpcinfo-flushed +all: $(DIRS) rpcinfo-flushed $(DIRS): make -C $@ diff --git a/tools/drakx-in-chroot b/tools/drakx-in-chroot index 1384c2e18..af1e51c1c 100755 --- a/tools/drakx-in-chroot +++ b/tools/drakx-in-chroot @@ -26,6 +26,7 @@ my ($disk_iso_repository, $repository_uri); --resolution=XXXxYYYY (eg: --resolution=1024x768)\n --repository=<path> path of packages repository --text text mode installer + --depth=XX set screen color depth "; (my $repository, my $dir, @ARGV) = @ARGV; @@ -41,6 +42,8 @@ foreach (@ARGV) { $wrapper = "gdb -q --args"; } elsif (/--strace/) { $wrapper = "strace -e file"; + } elsif (/--depth=(.*)/) { + $resolution .= "x$1"; } } my ($repository_without_arch, $repository_arch) = basename($repository) eq arch() ? (dirname($repository), '/' . arch()) : ($repository, ''); @@ -128,7 +131,7 @@ eval { cp_af('/etc/resolv.conf', "$SLASH_LOCATION/etc/resolv.conf") }; } my $Xnest_pid; -my $Xnest_bin = find { whereis_binary($_) } 'Xephyr', 'Xnest'; +my $Xnest_bin = find { whereis_binary($_) } 'Xephyr', 'Xnest' or die "Xephyr not find! Please install x11-server-xephyr!\n"; if (!-f ($SLASH_LOCATION . $AUTO_INSTALL_ROOTED) && $Xnest_bin && join('', @ARGV) !~ /--text/) { my $DISPLAY = ':8'; $Xnest_pid = fork(); @@ -184,6 +187,14 @@ sub create_initial_symlinks() { symlink $from, $to or die "symlinking $to failed\n"; } } + $from = "$STAGE2_LOCATION_ROOTED/usr"; + $to = "$SLASH_LOCATION/usr"; + symlink $from, $to or die "symlinking $to failed\n"; + foreach ('bin', 'sbin', 'lib', 'lib64') { + $from = "usr/$_"; + $to = "$SLASH_LOCATION/$_"; + symlink $from, $to or die "symlinking $to failed\n"; + } } sub create_initial_devices() { diff --git a/tools/install-xml-file-list b/tools/install-xml-file-list index 42a567ef5..7bd0588fe 100755 --- a/tools/install-xml-file-list +++ b/tools/install-xml-file-list @@ -258,7 +258,9 @@ sub install { } elsif ($expand eq 'binary') { $disallow_from_dir->(); - my @PATH = qw(/sbin /bin /usr/bin /usr/sbin /usr/X11R6/bin); + my @PATH = qw(/usr/sbin /usr/bin /usr/X11R6/bin); + unshift(@PATH, "/bin") unless ( -l "/bin" ); + unshift(@PATH, "/sbin") unless ( -l "/sbin" ); foreach my $name (map { expand_macros($_) } @text_l) { my @l = grep { -x $_ } map { "$_/$name" } @PATH; @l or error("can't find binary $name"), next; |