From a8aa14dc78f93c4e538bcbf6bbf25497fc7403cb Mon Sep 17 00:00:00 2001
From: Guillaume Cottenceau <gc@mandriva.com>
Date: Tue, 25 Nov 2003 18:20:40 +0000
Subject: prepare for stripped down version

---
 move/move.pm | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'move/move.pm')

diff --git a/move/move.pm b/move/move.pm
index 766a20acf..633dab83c 100644
--- a/move/move.pm
+++ b/move/move.pm
@@ -13,6 +13,8 @@ use lang;
 use Digest::MD5 qw(md5_hex);
 
 my @ALLOWED_LANGS = qw(en_US fr es it de);
+my $key_disabled;
+
 my ($using_existing_user_config, $using_existing_host_config);
 my $key_sysconf = '/home/.sysconf';
 my $virtual_key_part;
@@ -43,6 +45,7 @@ sub handle_etcfiles {
 }
 
 sub handle_virtual_key {
+    return if $key_disabled;
     if (my ($device, $file, $options) = cat_('/proc/cmdline') =~ /\bvirtual_key=([^,\s]+),([^,\s]+)(,\S+)?/) {
         log::l("using device=$device file=$file as a virtual key with options $options");
         my $dir = '/virtual_key_mount';
@@ -122,6 +125,8 @@ sub init {
 
     -d '/lib/modules/' . c::kernel_version() or warn("ERROR: kernel package " . c::kernel_version() . " not installed\n"), c::_exit(1);
 
+    $key_disabled = -e '/image/move/key_disabled';
+
     system('sysctl -w kernel.hotplug="/bin/true"');
     modules::load_category('bus/usb'); 
     eval { modules::load('usb-storage', 'sd_mod') };
@@ -197,6 +202,8 @@ sub install2::handleI18NClp {
 sub key_parts {
     my ($o) = @_;
 
+    return () if $key_disabled;
+
     my @keys = grep { $_->{usb_media_type} && index($_->{usb_media_type}, 'Mass Storage|') == 0 && $_->{media_type} eq 'hd' } @{$o->{all_hds}{hds}};
     map_index { 
 	$_->{mntpoint} = $::i ? "/mnt/key$::i" : '/home';
@@ -283,6 +290,8 @@ sub key_installfiles {
 sub install2::verifyKey {
     my ($o) = $::o;
 
+    log::l("automatic transparent key support is disabled"), return if $key_disabled;
+
     while (cat_('/proc/mounts') !~ m|\s/home\s|) {
         
         $o->ask_okcancel_({ title => N("Need a key to save your data"), 
-- 
cgit v1.2.1