summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/fs/type.pm3
-rw-r--r--perl-install/install2.pm2
-rw-r--r--perl-install/raid.pm4
-rwxr-xr-xperl-install/standalone/drakperm1
-rwxr-xr-xperl-install/standalone/logdrake1
5 files changed, 2 insertions, 9 deletions
diff --git a/perl-install/fs/type.pm b/perl-install/fs/type.pm
index 5fcc7facc..1c72f6160 100644
--- a/perl-install/fs/type.pm
+++ b/perl-install/fs/type.pm
@@ -8,7 +8,7 @@ use common;
our @ISA = qw(Exporter);
our @EXPORT = qw(
- isEmpty isExtended isTrueLocalFS isTrueFS isDos isSwap isOtherAvailableFS isRawLVM isRawRAID isRAID isLVM isMountableRW isNonMountable isPartOfLVM isPartOfRAID isPartOfLoopback isLoopback isMounted isBusy isSpecial isApple isAppleBootstrap isWholedisk isHiddenMacPart isFat_or_NTFS
+ isEmpty isExtended isTrueLocalFS isTrueFS isDos isSwap isOtherAvailableFS isRawLVM isRawRAID isRAID isLVM isMountableRW isNonMountable isPartOfLVM isPartOfRAID isPartOfLoopback isLoopback isMounted isBusy isSpecial isApple isAppleBootstrap isWholedisk isFat_or_NTFS
maybeFormatted set_isFormatted
);
@@ -321,7 +321,6 @@ sub isDos { arch() !~ /^sparc/ && ${{ 1 => 1, 4 => 1, 6 => 1 }}{$_[0]{pt_type}}
sub isFat_or_NTFS { member($_[0]{fs_type}, 'vfat', 'ntfs') }
sub isApple { $_[0]{pt_type} == 0x401 && defined $_[0]{isDriver} }
sub isAppleBootstrap { $_[0]{pt_type} == 0x401 && defined $_[0]{isBoot} }
-sub isHiddenMacPart { defined $_[0]{isMap} }
sub isTrueFS { isTrueLocalFS($_[0]) || member($_[0]{fs_type}, qw(nfs)) }
sub isTrueLocalFS { member($_[0]{fs_type}, true_local_fs_types()) }
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 64ce3f2e2..2dde6a685 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -2,7 +2,7 @@ package install2; # $Id$
use diagnostics;
use strict;
-use vars qw($o $version);
+use vars qw($o);
#-######################################################################################
#- misc imports
diff --git a/perl-install/raid.pm b/perl-install/raid.pm
index 3b66c8c08..b2819f185 100644
--- a/perl-install/raid.pm
+++ b/perl-install/raid.pm
@@ -228,10 +228,6 @@ sub is_active {
member($dev, active_mds());
}
-sub inactivate_all() {
- run_program::run('mdadm', '--stop', devices::make($_)) foreach active_mds();
-}
-
sub prepare_prefixed {
my ($raids) = @_;
diff --git a/perl-install/standalone/drakperm b/perl-install/standalone/drakperm
index 2b0ee0900..33424343a 100755
--- a/perl-install/standalone/drakperm
+++ b/perl-install/standalone/drakperm
@@ -10,7 +10,6 @@ use ugtk2 qw(:helpers :wrappers :create);
$ugtk2::wm_icon = "/usr/share/mcc/themes/default/drakperm-mdk.png";
require_root_capability();
-local $_ = join '', @ARGV;
#- vars declaration
my ($level) = chomp_(`cat /etc/sysconfig/msec | grep SECURE_LEVEL= |cut -d= -f2`);
diff --git a/perl-install/standalone/logdrake b/perl-install/standalone/logdrake
index 6a188a04d..586df98e7 100755
--- a/perl-install/standalone/logdrake
+++ b/perl-install/standalone/logdrake
@@ -27,7 +27,6 @@ use standalone; #- warning, standalone must be loaded very first, for 'expla
use common;
use interactive;
use ugtk2 qw(:create :dialogs :helpers :wrappers);
-use vars qw(*F);
$ugtk2::wm_icon = "/usr/share/mcc/themes/default/logdrake-mdk.png";
my $in = 'interactive'->vnew('su');