From 49d1e78bd7ff119e5ef19ef2386faa9bb0c9cc56 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 16 May 2008 13:46:43 +0000
Subject: - fix partimage_whole_disk: adapt to libDrakX changes

(backport from trunk)
---
 rescue/NEWS                 | 2 ++
 rescue/list.xml             | 2 ++
 rescue/partimage_whole_disk | 3 ---
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/rescue/NEWS b/rescue/NEWS
index 386b5d20a..74f958d1b 100644
--- a/rescue/NEWS
+++ b/rescue/NEWS
@@ -1,3 +1,5 @@
+- fix partimage_whole_disk: adapt to libDrakX changes
+
 Version 1.7 - 25 September 2007, by Pascal "Pixel" Rigaux
 
 - add mount.nfs binary (since mount doesn't handle nfs fs anymore)
diff --git a/rescue/list.xml b/rescue/list.xml
index 550617cc3..defc67fe3 100644
--- a/rescue/list.xml
+++ b/rescue/list.xml
@@ -236,6 +236,8 @@
     </to>
     <to dir="/usr/sbin">
       partimage_whole_disk
+      fs/dmraid.pm <!-- required by fsedit -->
+      partition_table/*.pm <!-- required by partimage_whole_disk -->
     </to>
   </from>
   <from dir="/usr/lib/libDrakX">
diff --git a/rescue/partimage_whole_disk b/rescue/partimage_whole_disk
index 91c92ac70..231593dc0 100755
--- a/rescue/partimage_whole_disk
+++ b/rescue/partimage_whole_disk
@@ -12,9 +12,6 @@ use common;
 use partition_table::empty;
 use Carp::Heavy;
 
-#- help getting the file in make_rescue_img
-BEGIN { partition_table::raw::default_type() }
-
 my %options = (
     save_home_directory => 1,
     empty_space_at_end_of_disk => 0, # 300 * 1024 * 2, # 300MB
-- 
cgit v1.2.1