diff options
| author | Olivier Blin <oblin@mandriva.com> | 2009-09-15 13:00:41 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2009-09-15 13:00:41 +0000 |
| commit | 898bb7add4e344d9677920ae00ef36db07b1d884 (patch) | |
| tree | 2514ae692d29b967c56b88f344235abdedf09021 | |
| parent | a26c9e34599baf39622cc7af0b6afd78745a9788 (diff) | |
| download | drakiso-898bb7add4e344d9677920ae00ef36db07b1d884.tar drakiso-898bb7add4e344d9677920ae00ef36db07b1d884.tar.gz drakiso-898bb7add4e344d9677920ae00ef36db07b1d884.tar.bz2 drakiso-898bb7add4e344d9677920ae00ef36db07b1d884.tar.xz drakiso-898bb7add4e344d9677920ae00ef36db07b1d884.zip | |
use format_disk for usb devices too
| -rwxr-xr-x | draklive | 8 | ||||
| -rw-r--r-- | lib/MDV/Draklive/Storage.pm | 2 |
2 files changed, 1 insertions, 9 deletions
@@ -821,14 +821,6 @@ sub format_cdrom_device { run_('wodim', '-v', 'dev=' . get_media_device($live, $opts), "blank=fast"); } -sub format_usb_device { - my ($live, $opts) = @_; - my $device = get_media_device($live, $opts); - maybe_umount_device($device); - MDV::Draklive::Utils::device_mkfs($device, $live->{media}->get_media_setting('fs'), $live->{media}->get_media_setting('inode_size')) - or die "unable to format device $device\n"; -} - #- $opts: #- media: alternate media sub format_device { diff --git a/lib/MDV/Draklive/Storage.pm b/lib/MDV/Draklive/Storage.pm index 8966f0a..0bf6d3b 100644 --- a/lib/MDV/Draklive/Storage.pm +++ b/lib/MDV/Draklive/Storage.pm @@ -26,7 +26,7 @@ our %storage_types = ( source => 'LABEL=MDVUSBROOT', detect => sub { grep { detect_devices::isKeyUsb($_) } detect_devices::get() }, create => \&main::create_disk_master, - format => \&main::format_usb_device, + format => \&main::format_disk, record => \&main::record_usb_master, image => \&main::create_disk_image, replicator => \&main::create_usb_replicator, |