diff options
author | Olivier Blin <oblin@mandriva.com> | 2007-05-02 09:46:53 +0000 |
---|---|---|
committer | Olivier Blin <oblin@mandriva.com> | 2007-05-02 09:46:53 +0000 |
commit | 512f00763809911aca62d82abf6c7ca0508a8069 (patch) | |
tree | 29d32110aa7b2fe9f43954a344b876cee02dd3d0 | |
parent | a5d904b1c034238d725cb4759cb61fbd89f74330 (diff) | |
download | draklive-512f00763809911aca62d82abf6c7ca0508a8069.tar draklive-512f00763809911aca62d82abf6c7ca0508a8069.tar.gz draklive-512f00763809911aca62d82abf6c7ca0508a8069.tar.bz2 draklive-512f00763809911aca62d82abf6c7ca0508a8069.tar.xz draklive-512f00763809911aca62d82abf6c7ca0508a8069.zip |
move media files copy in post-install step
-rwxr-xr-x | draklive | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -730,7 +730,12 @@ sub post_install_system { run_({ setarch => $live->{settings}{arch} }, "chroot", get_system_root($live), "bash", "-c", $live->{system}{postInstall}) if $live->{system}{postInstall}; - mkdir_p(get_builddir($live)); + + mkdir_p(get_builddir($live) . $live->{prefix}{build}{files}); + if ($live->{media}{files}) { + copy_files_to($live, $live->{media}{files}, get_builddir($live) . $live->{prefix}{build}{files}); + } + run_("chroot ". get_system_root($live) . " rpm -qa | sort > " . get_builddir($live) . "/packages.lst"); umask $previous_umask; @@ -1059,7 +1064,7 @@ sub record_usb_master { 'rsync', '-vdP', '--inplace', $loopbacks_source, $live->{mnt} . $live->{prefix}{media}{loopbacks}) or die "unable to copy loopback files"; - copy_files_to($live, $live->{media}{files}, $live->{mnt}); + cp_af(glob(get_builddir($live) . $live->{prefix}{build}{files} . '/*'), $live->{mnt}) } unless $opts->{boot_only}; run_('umount', $live->{mnt}); @@ -1290,6 +1295,7 @@ sub complete_config { my $default_prefix = { build => { boot => '/boot', + files => '/files', images => '/images', initrd => '/initrd', loopbacks => '/loopbacks', |