From 059feb224f78b3b94077746f441718deb0c192ab Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 16 Jul 2003 11:35:54 +0000
Subject: remove mkswap from commands.pm, so no need anymore to have mkswap_
 (the drawback is that the mkswap command won't create the device anymore)

---
 perl-install/Makefile    | 2 +-
 perl-install/commands.pm | 8 +-------
 perl-install/swap.pm     | 2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/Makefile b/perl-install/Makefile
index c675344fc..c6ad8418a 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -146,7 +146,7 @@ endif
 	perl -pi -e 's/\s*use\s+(warnings|diagnostics|vars|strict).*//g' $(DEST)/usr/*/*/*/utf8_heavy.pl
 
 	mv -f $(DEST)/bin/* $(DEST)/sbin/* $(DEST)/usr/bin
-	cd $(DEST)/usr/bin ; mv insmod insmod_; mv mkswap mkswap_
+	cd $(DEST)/usr/bin ; mv insmod insmod_
 	rmdir $(DEST)/bin $(DEST)/sbin
 
 	perl -ane 'symlink "$$F[1]", "$(DEST)/usr/bin/$$F[0]"' share/aliases
diff --git a/perl-install/commands.pm b/perl-install/commands.pm
index eb14a1362..77991a0e0 100644
--- a/perl-install/commands.pm
+++ b/perl-install/commands.pm
@@ -3,7 +3,7 @@ package commands; # $Id$
 #-########################################################################
 #- This file implement many common shell commands:
 #- true, false, cat, which, dirname, basename, rmdir, lsmod, grep, tr,
-#- mount, umount, mkdir, mknod, ln, rm, chmod, chown, mkswap, swapon,
+#- mount, umount, mkdir, mknod, ln, rm, chmod, chown, swapon,
 #- swapoff, ls, cp, ps, dd, head, tail, strings, hexdump, more, insmod,
 #- modprobe, route, df, kill, lspci, lssbus, dmesg, sort, du, 
 #-########################################################################
@@ -162,12 +162,6 @@ sub chown_ {
     &$chown(@_);
 }
 
-sub mkswap {
-    @_ == 1 or die "mkswap <device>\n";
-    require swap;
-    swap::enable($_[0], 0);
-}
-
 sub swapon {
     @_ == 1 or die "swapon <file>\n";
     require swap;
diff --git a/perl-install/swap.pm b/perl-install/swap.pm
index c40f498c5..f9bacf492 100644
--- a/perl-install/swap.pm
+++ b/perl-install/swap.pm
@@ -9,7 +9,7 @@ use devices;
 
 sub make {
     my ($dev, $checkBlocks) = @_;
-    run_program::raw({ timeout => 60 * 60 }, "mkswap_", if_($checkBlocks, '-c'), devices::make($dev)) or die \N("%s formatting of %s failed", 'swap', $dev);
+    run_program::raw({ timeout => 60 * 60 }, "mkswap", if_($checkBlocks, '-c'), devices::make($dev)) or die \N("%s formatting of %s failed", 'swap', $dev);
 }
 
 sub enable {
-- 
cgit v1.2.1