adapt to new directories layout:

- Mandrake/mdkinst -> install/stage2/live
- Mandrake/base/mdkinst_stage2.bz2 -> install/stage2/mdkinst_stage2.bz2
- Mandrake/base/rpmsrate -> media/media_info/rpmsrate
- Mandrake/RPMS -> media/main
- images -> install/images
- isolinux -> install/isolinux
- Mandrake/share/advertising -> install/extra/advertising

13 files changed, 47 insertions, 54 deletions

diff --git a/perl-install/Makefile b/perl-install/Makefile
index eca24f33e..64e9ef435 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -3,6 +3,7 @@ PKGVERSION:=$(shell rpm -q --qf '%{VERSION}\n' --specfile $(PACKAGE).spec|head -
 RELEASE:=$(shell rpm -q --qf '%{RELEASE}\n' --specfile $(PACKAGE).spec|head -n 1)
 TAG := $(shell echo "V$(PKGVERSION)_$(RELEASE)" | tr -- '-.' '__')
 
+include ../Makefile.config
 include Makefile.config
 
 POFILES   = $(shell ls share/po/*.po)
@@ -108,7 +109,7 @@ get_needed_files: $(DIRS) mo_files
 	install -d $(DEST)/usr/share/gtk
 	install -d $(DEST)/usr/share/xmodmap
 	install -d $(DEST)/usr/X11R6/lib/X11
-	install -d $(ROOTDEST)/Mandrake/base
+	install -d $(MEDIA_INFO_DEST)
 	install -s $(LOCALFILES) $(DEST)/usr/bin
 #	cp -f $(LOCALFILES2) $(DEST)/usr/bin
 	ln -s ../X11R6/lib/X11 $(DEST)/usr/lib/X11
@@ -171,9 +172,9 @@ endif
 	-cd share ; cp -f *.png $(DEST)/usr/share
 	-cd pixmaps ; cp -af *.png *.xpm $(DEST)/usr/share ; rm -f $(DEST)/usr/share/wiz_*
 	cp `perl -I. -Mlang -e 'lang::png_lang_files()'` $(DEST)/usr/share/langs
-	cd share ; cp compssUsers compssUsers.* rpmsrate $(ROOTDEST)/Mandrake/base
+	cd share ; cp compssUsers compssUsers.* rpmsrate $(MEDIA_INFO_DEST)
 
-	clean-rpmsrate $(ROOTDEST)/Mandrake/base/rpmsrate $(ROOTDEST)/Mandrake/RPMS*
+	clean-rpmsrate $(MEDIA_INFO_DEST)/rpmsrate $(MAIN_RPMS_DIR)
 
 	for i in ../kernel/modules.description ../kernel/all.modules/modules.cz*; do cp -f $$i $(DEST)/lib/; done
 
@@ -194,7 +195,7 @@ endif
 
 full_stage2:
 	$(MAKE) stage2
-	$(ROOTDEST)/misc/make_mdkinst_stage2 $(DEST) $(ROOTDEST)/Mandrake/base/mdkinst_stage2
+	$(MISC_DEST)/make_mdkinst_stage2 $(DEST) $(STAGE2_DEST)/mdkinst_stage2
 
 stage2:
 	if [ `id -u` = 0 ]; then rm -rf $(DEST); else $(SUDO) rm -rf $(DEST); fi
diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config
index 6030fd98b..89f63c069 100644
--- a/perl-install/Makefile.config
+++ b/perl-install/Makefile.config
@@ -1,17 +1,8 @@
 # -*- Makefile -*-
-ARCH := $(patsubst i%86,i386,$(shell uname -m))
-ARCH := $(patsubst sparc%,sparc,$(ARCH))
-
-ifeq (x86_64, $(ARCH))
-LIB = lib64
-else
-LIB	= lib
-endif
-
 VERSION     = 2.2.10-BOOT                                                                             
 SUDO        = sudo
 SO_FILES    = c/blib/arch/auto/c/c.so                                                                 
-PMS_DIRS    = Newt Xconfig c xf86misc diskdrake harddrake interactive modules network partition_table printer resize_fat sbus_probing security 
+PMS_DIRS    = Newt Xconfig c xf86misc diskdrake harddrake interactive modules network partition_table printer resize_fat sbus_probing security fs
 PMS         = *.pm $(PMS_DIRS:%=%/*.pm) commands install2
 STANDALONEPMS_ = XFdrake adduserdrake diskdrake drakTermServ drakautoinst drakauth drakbackup drakboot drakbug drakbug_report drakclock drakconnect drakedm drakfirewall drakfloppy drakfont drakgw drakhelp drakperm drakproxy drakpxe draksec draksound draksplash drakupdate_fstab drakups drakvpn drakxservices drakxtv fileshareset harddrake2 keyboarddrake localedrake logdrake lsnetdrake mousedrake net_applet net_monitor printerdrake scannerdrake service_harddrake service_harddrake_confirm bootloader-config
 
@@ -19,9 +10,7 @@ STANDALONEPMS = $(STANDALONEPMS_:%=standalone/%)
 ALLPMS	    = $(PMS) $(STANDALONEPMS) share/advertising/*.pl
 REP4PMS     = /usr/bin/perl-install
 ROOTDEST    = /export
-DEST        = $(ROOTDEST)/Mandrake/mdkinst
-STAGE2      = $(ROOTDEST)/Mandrake/base/mdkinst_stage2
-BASE        = $(ROOTDEST)/Mandrake/base
+DEST        = $(STAGE2_LIVE)
 DESTREP4PMS = $(DEST)$(REP4PMS)
 PERL        = perl
 LOCALFILES  = $(patsubst %, ../tools/%,ddcprobe/ddcxinfos serial_probe/serial_probe xhost+)
diff --git a/perl-install/Makefile.drakxtools b/perl-install/Makefile.drakxtools
index 8746ba7ea..f0cbadadf 100644
--- a/perl-install/Makefile.drakxtools
+++ b/perl-install/Makefile.drakxtools
@@ -1,4 +1,5 @@
 # -*- Makefile -*-
+include ../Makefile.config
 include Makefile.config
 
 INLIBDEST_DIRS = Newt c resize_fat xf86misc sbus_probing 
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index bc25dcf5f..8d785cae7 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -420,7 +420,7 @@ sub main {
     } %cmdline;
 
     if ($::testing) {
-	$ENV{SHARE_PATH} ||= "/export/Mandrake/mdkinst/usr/share";
+	$ENV{SHARE_PATH} ||= "/export/install/stage2/live/usr/share";
 	$ENV{SHARE_PATH} = "/usr/share" if !-e $ENV{SHARE_PATH};
     } else {
 	$ENV{SHARE_PATH} ||= "/usr/share";
@@ -531,9 +531,9 @@ sub main {
     modules::load_category($o->{modules_conf}, 'bus/usb'); 
 
     #- oem patch should be read before to still allow patch or defcfg.
-    eval { $o = $::o = install_any::loadO($o, "Mandrake/base/patch-oem.pl"); log::l("successfully read oem patch") };
+    eval { $o = $::o = install_any::loadO($o, "install/patch-oem.pl"); log::l("successfully read oem patch") };
     #- recovery mode should be read early to allow default parameter to be taken.
-    eval { $o = $::o = install_any::loadO($o, "Mandrake/base/recovery.cfg"); log::l("successfully read recovery") } if $::recovery;
+    eval { $o = $::o = install_any::loadO($o, "install/recovery.cfg"); log::l("successfully read recovery") } if $::recovery;
     $@ and $::recovery = 0; #- avoid keeping recovery if there was a problem reading the recovery.cfg file.
     #- patch should be read after defcfg in order to take precedance.
     eval { $o = $::o = install_any::loadO($o, $cfg); log::l("successfully read default configuration: $cfg") } if $cfg;
@@ -669,7 +669,7 @@ sub main {
 
     #- save recovery file if needed (ie disk style install).
     $o->{method} eq 'disk' and
-      output($o->{prefix}.any::hdInstallPath()."/Mandrake/base/recovery.cfg", install_any::g_auto_install(1));
+      output($o->{prefix} . any::hdInstallPath() . '/install/recovery.cfg', install_any::g_auto_install(1));
 
     #- mainly for auto_install's
     #- do not use run_program::xxx because it doesn't leave stdin/stdout unchanged
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 286e88be8..66511f2e1 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -212,7 +212,7 @@ sub getFile {
     } || errorOpeningFile($f);
 }
 sub getAndSaveFile {
-    my ($file, $local) = @_ == 1 ? ("Mandrake/mdkinst$_[0]", $_[0]) : @_;
+    my ($file, $local) = @_ == 1 ? ("install/stage2/live$_[0]", $_[0]) : @_;
     local $/ = \ (16 * 1024);
     my $f = ref($file) ? $file : getFile($file) or return;
     open(my $F, ">$local") or log::l("getAndSaveFile(opening $local): $!"), return;
@@ -390,10 +390,10 @@ sub setPackages {
 			$o->{packages},
 			"hdlist$medium.cz",
 			$medium,
-			'Mandrake/RPMS',
+			'media/main',
 			"Supplementary CD $medium",
 			1, # selected
-			"/mnt/cdrom/Mandrake/base/hdlist$medium.cz",
+			"/mnt/cdrom/media/main/media_info/hdlist$medium.cz",
 		    );
 		    if ($supplmedium) {
 			log::l("read suppl hdlist");
@@ -426,11 +426,11 @@ sub setPackages {
 	#- if there is a supplementary CD, override the rpmsrate/compssUsers
 	pkgs::read_rpmsrate(
 	    $o->{packages},
-	    getFile($suppl_CDs ? "/mnt/cdrom/Mandrake/base/rpmsrate" : "Mandrake/base/rpmsrate")
+	    getFile($suppl_CDs ? "/mnt/cdrom/media/media_info/rpmsrate" : "media/media_info/rpmsrate")
 	);
 	($o->{compssUsers}, $o->{compssUsersSorted}) = pkgs::readCompssUsers(
 	    $o->{meta_class},
-	    $suppl_CDs ? "/mnt/cdrom/Mandrake/base/compssUsers" : "",
+	    $suppl_CDs ? "/mnt/cdrom/media/media_info/compssUsers" : "",
 	);
 
 	#- preselect default_packages and compssUsersChoices.
@@ -674,7 +674,7 @@ sub install_urpmi {
 					   http => $ENV{URLPREFIX},
 					   cdrom => "removable://mnt/cdrom" }}{$method} ||
 		       #- for live_update or live_install script.
-		       readlink("/tmp/image/Mandrake") =~ m,^(/.*)/Mandrake/*$, && "removable:/$1") . "/$_->{rpmsdir}";
+		       readlink("/tmp/image/media") =~ m,^(/.*)/media/*$, && "removable:/$1") . "/$_->{rpmsdir}";
 	    #- use list file only if visible password or macro.
 	    my $need_list = $dir =~ m,^(?:[^:]*://[^/:\@]*:[^/:\@]+\@|.*%{),; #- }
 
@@ -720,7 +720,7 @@ sub install_urpmi {
 	    my ($qname, $qdir) = ($name, $dir);
 	    $qname =~ s/(\s)/\\$1/g; $qdir =~ s/(\s)/\\$1/g;
 
-	    #- compute correctly reference to Mandrake/base
+	    #- compute correctly reference to media/media_info
 	    my $with;
 	    if ($_->{update}) {
 		#- an update medium always use "../base/hdlist.cz";
@@ -729,7 +729,7 @@ sub install_urpmi {
 		$with = $_->{rpmsdir};
 		$with =~ s|/[^/]*%{ARCH}.*||;
 		$with =~ s|/+|/|g; $with =~ s|/$||; $with =~ s|[^/]||g; $with =~ s!/!../!g;
-		$with .= "../Mandrake/base/$_->{hdlist}";
+		$with .= "../media/media_info/$_->{hdlist}";
 	    }
 
 	    #- output new urpmi.cfg format here.
@@ -862,9 +862,9 @@ sub getAndSaveInstallFloppies {
 	$image .= arch() =~ /sparc64/ && "64"; #- for sparc64 there are a specific set of image.
 
 	if ($have_drivers) {
-	    getAndSaveFile("images/${image}_drivers.img", "$dest_dir/${name}_drivers.img") or log::l("failed to write Install Floppy (${image}_drivers.img) to $dest_dir/${name}_drivers.img"), return;
+	    getAndSaveFile("install/images/${image}_drivers.img", "$dest_dir/${name}_drivers.img") or log::l("failed to write Install Floppy (${image}_drivers.img) to $dest_dir/${name}_drivers.img"), return;
 	}
-	getAndSaveFile("images/$image.img", "$dest_dir/$name.img") or log::l("failed to write Install Floppy ($image.img) to $dest_dir/$name.img"), return;
+	getAndSaveFile("install/images/$image.img", "$dest_dir/$name.img") or log::l("failed to write Install Floppy ($image.img) to $dest_dir/$name.img"), return;
 
 	"$dest_dir/$name.img", if_($have_drivers, "$dest_dir/${name}_drivers.img");
     }
@@ -1162,7 +1162,7 @@ sub copy_advertising {
     return if $::rootwidth < 800;
 
     my $f;
-    my $source_dir = "Mandrake/share/advertising";
+    my $source_dir = "install/extra/advertising";
     foreach ("." . $o->{locale}{lang}, "." . substr($o->{locale}{lang},0,2), '') {
 	$f = getFile("$source_dir$_/list") or next;
 	$source_dir = "$source_dir$_";
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 625e1d941..645f3fe0d 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -338,7 +338,7 @@ sub beforeInstallPackages {
 
     #- add oem theme if the files exists.
     mkdir_p("$o->{prefix}/usr/share");
-    install_any::getAndSaveFile("Mandrake/base/oem-theme.rpm", "$o->{prefix}/usr/share/oem-theme.rpm");
+    install_any::getAndSaveFile("install/oem-theme.rpm", "$o->{prefix}/usr/share/oem-theme.rpm");
 }
 
 sub pkg_install {
@@ -406,7 +406,7 @@ sub afterInstallPackages($) {
 
     die N("Some important packages didn't get installed properly.
 Either your cdrom drive or your cdrom is defective.
-Check the cdrom on an installed computer using \"rpm -qpl Mandrake/RPMS/*.rpm\"
+Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm\"
 ") if any { m|read failed: Input/output error| } cat_("$o->{prefix}/root/drakx/install.log");
 
     if (arch() !~ /^sparc/) { #- TODO restore it as may be needed for sparc
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 606252218..cf7ad0cdf 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -114,7 +114,7 @@ sub new($$) {
 	    my ($prog, $Driver) = /Driver:(.*)/ ? ('Xorg', $1) : /Xsun|Xpmac|Xnest|^X_move$/ ? $_ : "XF86_$_";
 	    unless (-x "$dir/$prog") {
 		unlink $_ foreach glob_("$dir/X*");
-		install_any::getAndSaveFile("Mandrake/mdkinst$dir/$prog", "$dir/$prog") or die "failed to get server $prog: $!";
+		install_any::getAndSaveFile("install/stage2/live$dir/$prog", "$dir/$prog") or die "failed to get server $prog: $!";
 		chmod 0755, "$dir/$prog";
 	    }
 	    if (/FB/i) {
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 59ee3e5bb..499c15bac 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -873,7 +873,7 @@ sub set {
 	symlink "../$main_charset/$_", "$dir/$lang/$_" foreach @LCs, 'LC_MESSAGES';	    
 	
 	#- getting LC_CTYPE (putting it directly in $lang)
-	install_any::getAndSaveFile("Mandrake/mdkinst$dir/$charset/LC_CTYPE", "$dir/$lang/LC_CTYPE");
+	install_any::getAndSaveFile("install/stage2/live$dir/$charset/LC_CTYPE", "$dir/$lang/LC_CTYPE");
     }
     
     #- set all LC_* variables to a unique locale ("C"), and only redefine
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 6370ba600..8ea7ba431 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -258,7 +258,7 @@ sub extract_modules {
     if (!-e $cz) {
 	unlink $_ foreach glob_("/lib/modules*.cz*");
 	require install_any;
-        install_any::getAndSaveFile("Mandrake/mdkinst$cz", $cz) or die "failed to get modules $cz: $!";
+        install_any::getAndSaveFile("install/stage2/live$cz", $cz) or die "failed to get modules $cz: $!";
     }
     eval {
 	require packdrake;
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 62eccef1a..5a31480e1 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -361,25 +361,25 @@ sub psUpdateHdlistsDeps {
 	my $hdlistf = "$urpmidir/hdlist.$_->{fakemedium}.cz" . ($_->{hdlist} =~ /\.cz2/ && "2");
 	my $synthesisf = "$urpmidir/synthesis.hdlist.$_->{fakemedium}.cz" . ($_->{hdlist} =~ /\.cz2/ && "2");
 	if (-s $hdlistf != $_->{hdlist_size}) {
-	    install_any::getAndSaveFile("Mandrake/base/$_->{hdlist}", $hdlistf) or die "no $_->{hdlist} found";
+	    install_any::getAndSaveFile("media/media_info/$_->{hdlist}", $hdlistf) or die "no $_->{hdlist} found";
 	    symlinkf $hdlistf, "/tmp/$_->{hdlist}";
 	    ++$need_copy;
 	}
 	if (-s $synthesisf != $_->{synthesis_hdlist_size}) {
-	    install_any::getAndSaveFile("Mandrake/base/synthesis.$_->{hdlist}", $synthesisf);
+	    install_any::getAndSaveFile("media/media_info/synthesis.$_->{hdlist}", $synthesisf);
 	    -s $synthesisf > 0 or unlink $synthesisf;
 	}
     }
 
     if ($need_copy) {
 	#- this is necessary for urpmi.
-	install_any::getAndSaveFile("Mandrake/base/$_", "$urpmidir/$_") foreach qw(rpmsrate);
+	install_any::getAndSaveFile("media/media_info/$_", "$urpmidir/$_") foreach qw(rpmsrate);
     }
 }
 
 sub psUsingHdlists {
     my ($prefix, $method) = @_;
-    my $listf = install_any::getFile('Mandrake/base/hdlists') or die "no hdlists found";
+    my $listf = install_any::getFile('media/media_info/hdlists') or die "no hdlists found";
     my $packages = new URPM;
     my $suppl_CDs = 0;
 
@@ -434,7 +434,7 @@ sub psUsingHdlist {
     #- for getting header of package during installation or after by urpmi.
     my $newf = "$urpmidir/hdlist.$fakemedium.cz" . ($hdlist =~ /\.cz2/ && "2");
     -e $newf and do { unlink $newf or die "cannot remove $newf: $!" };
-    install_any::getAndSaveFile($o_fhdlist || "Mandrake/base/$hdlist", $newf) or do { unlink $newf; die "no $hdlist found" };
+    install_any::getAndSaveFile($o_fhdlist || "media/media_info/$hdlist", $newf) or do { unlink $newf; die "no $hdlist found" };
     $m->{hdlist_size} = -s $newf; #- keep track of size for post-check.
     symlinkf $newf, "/tmp/$hdlist";
 
@@ -442,7 +442,7 @@ sub psUsingHdlist {
     my $newsf = "$urpmidir/synthesis.hdlist.$fakemedium.cz" . ($hdlist =~ /\.cz2/ && "2");
     unless ($o_fhdlist) {
 	#- copy existing synthesis file too.
-	install_any::getAndSaveFile("Mandrake/base/synthesis.$hdlist", $newsf);
+	install_any::getAndSaveFile("media/media_info/synthesis.$hdlist", $newsf);
 	$m->{synthesis_hdlist_size} = -s $newsf; #- keep track of size for post-check.
 	-s $newsf > 0 or unlink $newsf;
     }
@@ -452,7 +452,7 @@ sub psUsingHdlist {
     if (!$o_fhdlist || $o_pubkey) {
 	$m->{pubkey} = $o_pubkey;
 	unless ($m->{pubkey}) {
-	    my $pubkey = install_any::getFile("Mandrake/base/pubkey" . ($hdlist =~ /hdlist(\S*)\.cz2?/ && $1));
+	    my $pubkey = install_any::getFile("media/media_info/pubkey" . ($hdlist =~ /hdlist(\S*)\.cz2?/ && $1));
 	    $m->{pubkey} = [ $packages->parse_armored_file($pubkey) ];
 	}
     }
@@ -579,7 +579,7 @@ sub read_rpmsrate {
 sub readCompssUsers {
     my ($meta_class, $file) = @_;
 
-    $file ||= 'Mandrake/base/compssUsers';
+    $file ||= 'media/media_info/compssUsers';
     my $f = $meta_class && install_any::getFile("$file.$meta_class") || install_any::getFile($file) or die "can't find $file";
     readCompssUsers_raw($f);
 }
diff --git a/perl-install/share/advertising/Makefile b/perl-install/share/advertising/Makefile
index 0ac5a0a86..c9313c3aa 100644
--- a/perl-install/share/advertising/Makefile
+++ b/perl-install/share/advertising/Makefile
@@ -1,10 +1,11 @@
-include ../../Makefile.config
+include ../../../Makefile.config
 
 PRODUCT = dwd
+DESTDIR = $(EXTRA_INSTALL_DEST)/advertising
 
 install:
-	rm -rf $(ROOTDEST)/Mandrake/share/advertising
-	install -d $(ROOTDEST)/Mandrake/share/advertising
-	install -m755 `cat list-$(PRODUCT) | sed 's/png$$/pl/'` $(ROOTDEST)/Mandrake/share/advertising
-	install -m644 `cat list-$(PRODUCT)` $(ROOTDEST)/Mandrake/share/advertising
-	install -m644 list-$(PRODUCT) $(ROOTDEST)/Mandrake/share/advertising/list
+	rm -rf $(DESTDIR)
+	install -d $(DESTDIR)
+	install -m755 `cat list-$(PRODUCT) | sed 's/png$$/pl/'` $(DESTDIR)
+	install -m644 `cat list-$(PRODUCT)` $(DESTDIR)
+	install -m644 list-$(PRODUCT) $(DESTDIR)/list
diff --git a/perl-install/share/po/Makefile b/perl-install/share/po/Makefile
index 2dca05819..92b6613af 100644
--- a/perl-install/share/po/Makefile
+++ b/perl-install/share/po/Makefile
@@ -1,3 +1,4 @@
+include ../../../Makefile.config
 include ../../Makefile.config
 
 PMSFILES = $(ALLPMS) ../move/move.pm ../move/tree/mdk_totem
diff --git a/perl-install/standalone/drakpxe b/perl-install/standalone/drakpxe
index 94640b458..1d2ca35ce 100755
--- a/perl-install/standalone/drakpxe
+++ b/perl-install/standalone/drakpxe
@@ -192,7 +192,7 @@ If you do not have an existing directory, please copy the CD or DVD contents.
       [ { label => N("Installation image directory"), val => \$dir, type => 'entry' }, ])
   or goto step_ip_range;
 
-unless (-d $dir && -e "$dir/VERSION" && -d "$dir/isolinux" && -d "$dir/Mandrake/base") {
+unless (-d $dir && -e "$dir/VERSION" && -d "$dir/install/isolinux" && -d "$dir/install/stage2") {
     $in->ask_warn(N("No image found"), 
 		  N("No CD or DVD image found, please copy the installation program and rpm files."));
     goto step_install_dir;
@@ -203,7 +203,7 @@ unless (-d $dir && -e "$dir/VERSION" && -d "$dir/isolinux" && -d "$dir/Mandrake/
 
 step_auto_install:
 
-my $auto_inst_cfg = "Mandrake/base/auto_inst.cfg"; #- TODO change according configuration?
+my $auto_inst_cfg = "install/auto_inst.cfg"; #- TODO change according configuration?
 -e "$dir/$auto_inst_cfg" or $auto_inst_cfg = '';
 
 $in->ask_from('Choose auto installation',
@@ -246,7 +246,7 @@ build_dhcpd_conf($dhcpd_conf, "/etc/dhcpd.conf");
 
 #- make kernel and initrd available for initrd.
 mkdir "/var/lib/tftpboot/PXEClient/images";
-sys("cp", "-af", "$dir/isolinux/alt0", "/var/lib/tftpboot/PXEClient/images/");
+sys("cp", "-af", "$dir/install/isolinux/alt0", "/var/lib/tftpboot/PXEClient/images/");
 
 my $pxelinux_cfg = parse_pxelinux_cfg("/var/lib/tftpboot/PXEClient/pxelinux.cfg/default");
 my $label;