diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2003-11-27 17:21:58 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2003-11-27 17:21:58 +0000 |
| commit | 144f6ca9d185bb8307d03dbb177789c9678ef3dc (patch) | |
| tree | 842e34101f34adab78bb6825944af357c39f5636 | |
| parent | e942f74d8c944d08fb500c3d507d1c7edbc70405 (diff) | |
| download | drakx-144f6ca9d185bb8307d03dbb177789c9678ef3dc.tar drakx-144f6ca9d185bb8307d03dbb177789c9678ef3dc.tar.gz drakx-144f6ca9d185bb8307d03dbb177789c9678ef3dc.tar.bz2 drakx-144f6ca9d185bb8307d03dbb177789c9678ef3dc.tar.xz drakx-144f6ca9d185bb8307d03dbb177789c9678ef3dc.zip | |
- handle non partitioned usb keys (they are in {raw_hds})
- set $ENV{XAUTHORITY} in case we want to use it one day
| -rw-r--r-- | move/move.pm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/move/move.pm b/move/move.pm index 5a2edde48..ea1e8b87a 100644 --- a/move/move.pm +++ b/move/move.pm @@ -208,12 +208,12 @@ sub key_parts { 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}}; + my @keys = grep { detect_devices::isKeyUsb($_) } @{$o->{all_hds}{hds}}; map_index { $_->{mntpoint} = $::i ? "/mnt/key$::i" : '/home'; $_->{options} = $key_mountopts; $_; - } fsedit::get_fstab(@keys); + } (fsedit::get_fstab(@keys), grep { detect_devices::isKeyUsb($_) } @{$o->{all_hds}{raw_hds}}); } sub key_mount { @@ -473,6 +473,7 @@ sub install_TrueFS_in_home { run_program::run('chown', '-R', "$user.$user", $dir); run_program::run('chown', '-R', "$user.$user", $cache); + $ENV{XAUTHORITY} = "$dir/.Xauthority"; $ENV{ICEAUTHORITY} = "$dir/.ICEauthority"; } } |