summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2009-08-03 13:16:19 +0000
committerOlivier Blin <oblin@mandriva.com>2009-08-03 13:16:19 +0000
commit6a5a7e6ed42d550615894963ab96f4d6f3f343f2 (patch)
tree57f1f364cf54c59f58a5167d1f3afefe7c2e11e3
parent15b6bd76f1d99e254204cdfb063d63d2eded1cdf (diff)
downloaddrakiso-6a5a7e6ed42d550615894963ab96f4d6f3f343f2.tar
drakiso-6a5a7e6ed42d550615894963ab96f4d6f3f343f2.tar.gz
drakiso-6a5a7e6ed42d550615894963ab96f4d6f3f343f2.tar.bz2
drakiso-6a5a7e6ed42d550615894963ab96f4d6f3f343f2.tar.xz
drakiso-6a5a7e6ed42d550615894963ab96f4d6f3f343f2.zip
remove dead code, we always mount the loopback before
-rwxr-xr-xdraklive8
1 files changed, 4 insertions, 4 deletions
diff --git a/draklive b/draklive
index b246f1e..76c66da 100755
--- a/draklive
+++ b/draklive
@@ -899,7 +899,7 @@ sub record_usb_master {
or die "unable to find recording device (missing label? try with --device <device>)\n";
mkdir_p($live->{mnt});
- run_('mount', if_(-f $device, '-o', 'loop'), $device, $live->{mnt})
+ run_('mount', $device, $live->{mnt})
or die "unable to mount $device\n";
rm_rf($live->{mnt} . $media_boot) if -e $live->{mnt} . $media_boot;
cp_af($live->get_builddir . $live->{prefix}{build}{boot}, $live->{mnt} . $media_boot);
@@ -951,7 +951,7 @@ sub record_harddisk_master {
or die "unable to find recording device (missing label? try with --device <device>)\n";
mkdir_p($live->{mnt});
- run_('mount', if_(-f $device, '-o', 'loop'), $device, $live->{mnt})
+ run_('mount', $device, $live->{mnt})
or die "unable to mount $device\n";
do {
@@ -1101,7 +1101,7 @@ sub record_oem_rescue {
my $media = $live->{oem_rescue}{media};
my $media_boot = $live->get_media_prefix('boot');
mkdir_p($live->{mnt});
- run_('mount', if_(-f $device, '-o', 'loop'), $device, $live->{mnt})
+ run_('mount', $device, $live->{mnt})
or die "unable to mount $device\n";
record_rescue_files($live->{mnt}, $device, [ get_rescue_files($live, $live->{oem_rescue}) ]);
@@ -1142,7 +1142,7 @@ sub record_usb_replicator {
my $device = get_media_device($live, $opts)
or die "unable to find recording device (missing label? try with --device <device>)\n";
mkdir_p($live->{mnt});
- run_('mount', if_(-f $device, '-o', 'loop'), $device, $live->{mnt})
+ run_('mount', $device, $live->{mnt})
or die "unable to mount $device\n";
rm_rf($live->{mnt} . $media_boot) if -e $live->{mnt} . $media_boot;
install_usb_bootloader($live, $media, $opts);