diff options
| author | Olivier Blin <oblin@mandriva.com> | 2007-12-13 17:54:34 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2007-12-13 17:54:34 +0000 |
| commit | fde6a95180e1ea5133eded7295c156c65e85ef1f (patch) | |
| tree | 6c5f1380fd0b2a3b45b5506bcfa0ab24e0618b73 | |
| parent | 2492db0a38a35dc2d00ccd38a4cf31051ddc5ecd (diff) | |
| download | draklive-fde6a95180e1ea5133eded7295c156c65e85ef1f.tar draklive-fde6a95180e1ea5133eded7295c156c65e85ef1f.tar.gz draklive-fde6a95180e1ea5133eded7295c156c65e85ef1f.tar.bz2 draklive-fde6a95180e1ea5133eded7295c156c65e85ef1f.tar.xz draklive-fde6a95180e1ea5133eded7295c156c65e85ef1f.zip | |
name images after live name instead of live.iso/live.img
| -rwxr-xr-x | draklive | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1056,7 +1056,7 @@ sub set_device_label { sub get_cdrom_master_path { my ($live, $opts) = @_; - get_builddir($live) . $live->{prefix}{build}{images} . '/' . ($opts->{boot} ? 'boot-' . $opts->{boot} : 'live') . '.iso'; + get_builddir($live) . $live->{prefix}{build}{images} . '/' . get_live_name($live) . ($opts->{boot} && "-boot-$opts->{boot}") . '.iso'; } sub create_cdrom_master { @@ -1097,7 +1097,7 @@ sub create_cdrom_master { sub get_usb_master_path { my ($live) = @_; - get_builddir($live) . $live->{prefix}{build}{images} . '/live.img'; + get_builddir($live) . $live->{prefix}{build}{images} . '/' . get_live_name($live) . '.img'; } sub create_usb_master { |