summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-09-16 20:54:34 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-09-16 20:54:34 +0000
commit0ee7cf50f9c9f8f91e386d209f13d793a0ad91d7 (patch)
treecc30eceed802d65cd6832f7be3c0a948a5e010de
parent2f14ac62602746a52e0ef43271c6d32f1202c8f9 (diff)
downloaddrakx-backup-do-not-use-0ee7cf50f9c9f8f91e386d209f13d793a0ad91d7.tar
drakx-backup-do-not-use-0ee7cf50f9c9f8f91e386d209f13d793a0ad91d7.tar.gz
drakx-backup-do-not-use-0ee7cf50f9c9f8f91e386d209f13d793a0ad91d7.tar.bz2
drakx-backup-do-not-use-0ee7cf50f9c9f8f91e386d209f13d793a0ad91d7.tar.xz
drakx-backup-do-not-use-0ee7cf50f9c9f8f91e386d209f13d793a0ad91d7.zip
use new mkdir_p, rm_rf and cp_af from MDK::Common
-rwxr-xr-xrescue/make_rescue_img7
1 files changed, 3 insertions, 4 deletions
diff --git a/rescue/make_rescue_img b/rescue/make_rescue_img
index a6cefb517..e3bb4e8ed 100755
--- a/rescue/make_rescue_img
+++ b/rescue/make_rescue_img
@@ -3,7 +3,6 @@
use MDK::Common;
use lib "../perl-install";
use keyboard;
-use commands;
use Config;
Config->import;
@@ -47,7 +46,7 @@ sub install_l {
sub installown($$) {
my ($own, $dir) = @_;
return if -e "$tmp$dir$own";
- commands::mkdir_("-p", "$tmp$dir") unless -d "$tmp$dir";
+ mkdir_p("$tmp$dir");
_ "cp -a $own $tmp$dir";
}
@@ -56,7 +55,7 @@ _ "mkdir $tmp";
_ 'find . -name "*~" | xargs rm -f';
foreach (cat_("dirs")) {
chomp;
- commands::mkdir_("-p", "$tmp$_");
+ mkdir_p("$tmp$_");
}
_ "cp -a tree/* $tmp";
_ "find $tmp -name 'CVS*' | xargs rm -rf";
@@ -94,7 +93,7 @@ exit 0 if $ARGV[0];
$size = `du -s $tmp | cut -f1` + 2048; #- add 2MB of free space
-commands::mkdir_("-p", $mnt) if !-e $mnt;
+mkdir_p($mnt);
__ "$sudo umount $rescue 2>/dev/null";
_ "dd if=/dev/zero of=$rescue bs=1k count=$size";