From fde6a95180e1ea5133eded7295c156c65e85ef1f Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Thu, 13 Dec 2007 17:54:34 +0000 Subject: name images after live name instead of live.iso/live.img --- draklive | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/draklive b/draklive index 2586f8c..01b62cc 100755 --- a/draklive +++ b/draklive @@ -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 { -- cgit v1.2.1