From bb4ab9c6857d4e9d147ca515704254507198eb65 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Fri, 30 May 2008 14:06:30 +0000
Subject: extract clean_harddrake_hds sub

---
 draklive-install | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

(limited to 'draklive-install')

diff --git a/draklive-install b/draklive-install
index ce006d9..9bc919e 100755
--- a/draklive-install
+++ b/draklive-install
@@ -231,6 +231,20 @@ sub copy_root {
     sync_logs();
 }
 
+sub clean_harddrake_hds {
+    my ($prefix) = @_;
+    #- remove harddisks from harddrake's config file, so that hardddisks
+    #- are automatically rediscovered at first boot
+    require Storable;
+    my $harddrake_file = $prefix . "/etc/sysconfig/harddrake2/previous_hw";
+    my $harddrake_conf = eval { Storable::retrieve($harddrake_file) };
+    if ($harddrake_conf) {
+        delete $harddrake_conf->{HARDDISK};
+        Storable::store($harddrake_conf, $harddrake_file);
+    }
+}
+
+
 sub complete_install {
     my ($in, $all_hds) = @_;
     my $_wait = $in->wait_message('', N("Please wait"));
@@ -271,15 +285,7 @@ sub complete_install {
 
     fs::write_fstab($all_hds, $::prefix);
 
-    #- remove harddisks from harddrake's config file, so that hardddisks
-    #- are automatically rediscovered at first boot
-    require Storable;
-    my $harddrake_file = $::prefix . "/etc/sysconfig/harddrake2/previous_hw";
-    my $harddrake_conf = eval { Storable::retrieve($harddrake_file) };
-    if ($harddrake_conf) {
-        delete $harddrake_conf->{HARDDISK};
-        Storable::store($harddrake_conf, $harddrake_file);
-    }
+    clean_harddrake_hds($::prefix);
 
     # enable back some disabled services
     require services;
-- 
cgit v1.2.1