diff options
| author | Francesc Pinyol Margalef <francesc.pinyol.m@gmail.com> | 2013-12-21 13:37:33 +0100 |
|---|---|---|
| committer | Francesc Pinyol Margalef <francesc.pinyol.m@gmail.com> | 2013-12-21 13:37:33 +0100 |
| commit | 095c6b25885ce3d22eedba8cdb98f1fd7e8708a5 (patch) | |
| tree | 5bfc768996b3ddec185abeb02b602b48b14d10db /tools/drakx-in-chroot | |
| parent | df60191bdbddfa7c8e5bd11a2578aae6740963c0 (diff) | |
| parent | f76dc0931e47338aa9c7db257d28e5015d8a2f47 (diff) | |
| download | drakx-095c6b25885ce3d22eedba8cdb98f1fd7e8708a5.tar drakx-095c6b25885ce3d22eedba8cdb98f1fd7e8708a5.tar.gz drakx-095c6b25885ce3d22eedba8cdb98f1fd7e8708a5.tar.bz2 drakx-095c6b25885ce3d22eedba8cdb98f1fd7e8708a5.tar.xz drakx-095c6b25885ce3d22eedba8cdb98f1fd7e8708a5.zip | |
Merge branch 'master' of git://git.mageia.org/software/drakx
Diffstat (limited to 'tools/drakx-in-chroot')
| -rwxr-xr-x | tools/drakx-in-chroot | 13 |
1 files changed, 12 insertions, 1 deletions
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() { |