summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mandriva.org>2009-04-20 14:17:32 +0000
committerPascal Terjan <pterjan@mandriva.org>2009-04-20 14:17:32 +0000
commit09b54cd90282109dd80cb4e71d50e21b710d54b2 (patch)
treeca83f252003efef2a1999cfd55c6b5e12b2c7d2e
parentc0efc80f35ace3a70d2b6a6295a76afcc3627fd3 (diff)
downloaddraklive-install-09b54cd90282109dd80cb4e71d50e21b710d54b2.tar
draklive-install-09b54cd90282109dd80cb4e71d50e21b710d54b2.tar.gz
draklive-install-09b54cd90282109dd80cb4e71d50e21b710d54b2.tar.bz2
draklive-install-09b54cd90282109dd80cb4e71d50e21b710d54b2.tar.xz
draklive-install-09b54cd90282109dd80cb4e71d50e21b710d54b2.zip
correctly exclude live_device when booting from hybrid USB image
-rw-r--r--NEWS2
-rwxr-xr-xdraklive-install2
2 files changed, 4 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index b62116a..3a14829 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- correctly exclude live_device when booting from hybrid USB image
+
1.16.2:
- translation updates
diff --git a/draklive-install b/draklive-install
index d2ccc42..d5befcc 100755
--- a/draklive-install
+++ b/draklive-install
@@ -132,7 +132,9 @@ sub init_hds {
#- remove live device from the detected hds, so that bootloader is not installed on it:
#- bootloader installation uses first device from detect_devices::get, which tries to list devices
#- by booting order, and our live system is likely to be here in first position
+ #- it can be either a partition (USB) or the full disk (Hybrid on USB)
@{$all_hds->{hds}} = grep {
+ $_->{device} ne $live_device &&
!member($live_device, map { $_->{device} } partition_table::get_normal_parts_and_holes($_));
} @{$all_hds->{hds}} if $live_device;