From 3375e6ac137002cf08d3ba3033c65fa3fbf2262f Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Thu, 28 Feb 2008 22:05:37 +0000
Subject: move create_minimal_files() from install::any to fs::any

---
 perl-install/fs/any.pm           | 12 ++++++++++++
 perl-install/install/any.pm      | 14 +-------------
 perl-install/install/install2.pm |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/perl-install/fs/any.pm b/perl-install/fs/any.pm
index a3277131b..00d4639a0 100644
--- a/perl-install/fs/any.pm
+++ b/perl-install/fs/any.pm
@@ -76,4 +76,16 @@ sub check_hds_boot_and_root {
     }
 }
 
+sub create_minimal_files() {
+    mkdir "$::prefix/$_", 0755 foreach 
+      qw(dev etc etc/profile.d etc/rpm etc/sysconfig etc/sysconfig/console 
+	etc/sysconfig/network-scripts etc/sysconfig/console/consolefonts 
+	etc/sysconfig/console/consoletrans
+	home mnt tmp var var/tmp var/lib var/lib/rpm var/lib/urpmi);
+    mkdir "$::prefix/$_", 0700 foreach qw(root root/tmp root/drakx);
+
+    devices::make("$::prefix/dev/null");
+    chmod 0666, "$::prefix/dev/null";
+}
+
 1;
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
index 94264d19c..77b05e937 100644
--- a/perl-install/install/any.pm
+++ b/perl-install/install/any.pm
@@ -1,4 +1,4 @@
-package install::any; # $Id$
+*package install::any; # $Id$
 
 use strict;
 
@@ -431,18 +431,6 @@ sub setPackages {
     }
 }
 
-sub create_minimal_files() {
-    mkdir "$::prefix/$_", 0755 foreach 
-      qw(dev etc etc/profile.d etc/rpm etc/sysconfig etc/sysconfig/console 
-	etc/sysconfig/network-scripts etc/sysconfig/console/consolefonts 
-	etc/sysconfig/console/consoletrans
-	home mnt tmp var var/tmp var/lib var/lib/rpm var/lib/urpmi);
-    mkdir "$::prefix/$_", 0700 foreach qw(root root/tmp root/drakx);
-
-    devices::make("$::prefix/dev/null");
-    chmod 0666, "$::prefix/dev/null";
-}
-
 sub count_files {
     my ($dir) = @_;
     -d $dir or return 0;
diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm
index 4fa14fb82..c45a46d33 100644
--- a/perl-install/install/install2.pm
+++ b/perl-install/install/install2.pm
@@ -176,7 +176,7 @@ sub formatPartitions {
 	eval { rm_rf("$::prefix/var/lib/rpm") };
     }
 
-    install::any::create_minimal_files();
+    fs::any::create_minimal_files();
 
     eval { fs::mount::mount('none', "$::prefix/proc", 'proc') };
     eval { fs::mount::mount('none', "$::prefix/sys", 'sysfs') };
-- 
cgit v1.2.1