summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>1999-10-12 11:27:11 +0000
committerFrancois Pons <fpons@mandriva.com>1999-10-12 11:27:11 +0000
commite1c4b28c6a055c57bd86df3dbe9da42175055297 (patch)
tree422c44856c0005af31ef38a6d8a6fdbcccdf677e /perl-install
parentc6e144f2c7b2a2ddd58a3382634da698015ee393 (diff)
downloaddrakx-e1c4b28c6a055c57bd86df3dbe9da42175055297.tar
drakx-e1c4b28c6a055c57bd86df3dbe9da42175055297.tar.gz
drakx-e1c4b28c6a055c57bd86df3dbe9da42175055297.tar.bz2
drakx-e1c4b28c6a055c57bd86df3dbe9da42175055297.tar.xz
drakx-e1c4b28c6a055c57bd86df3dbe9da42175055297.zip
*** empty log message ***
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/detect_devices.pm2
-rw-r--r--perl-install/fs.pm8
2 files changed, 6 insertions, 4 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 994fd30fb..1320c778d 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -109,6 +109,8 @@ sub getIDE() {
my $num = ord (($d =~ /(.)$/)[0]) - ord 'a';
push @idi, { type => $type, device => basename($d), info => $info, bus => $num/2, id => $num%2 };
}
+ #- test for zip
+ push @idi, { type => 'hd', device => 'hde', info => 'ZIP 100', bus => '1', id => 1 } if $::testing;
@idi;
}
diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index 36a480ee3..f25858d01 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -196,18 +196,18 @@ sub write($$) {
[ split ' ', '/dev/fd0 /mnt/floppy auto sync,user,noauto,nosuid,nodev,unhide 0 0' ],
[ split ' ', 'none /proc proc defaults 0 0' ],
[ split ' ', 'none /dev/pts devpts mode=0620 0 0' ],
- map_index {
+ (map_index {
my $i = $::i ? $::i + 1 : '';
mkdir "$prefix/mnt/cdrom$i", 0755 or log::l("failed to mkdir $prefix/mnt/cdrom$i: $!");
symlinkf $_->{device}, "$prefix/dev/cdrom$i" or log::l("failed to symlink $prefix/dev/cdrom$i: $!");
[ "/dev/cdrom$i", "/mnt/cdrom$i", "auto", "user,noauto,nosuid,exec,nodev,ro", 0, 0 ];
- } detect_devices::cdroms(),
- map_index { #- for zip drives, the right partition is the 4th.
+ } detect_devices::cdroms()),
+ (map_index { #- for zip drives, the right partition is the 4th.
my $i = $::i ? $::i + 1 : '';
mkdir "$prefix/mnt/zip$i", 0755 or log::l("failed to mkdir $prefix/mnt/zip$i: $!");
symlinkf "$_->{device}4", "$prefix/dev/zip$i" or log::l("failed to symlink $prefix/dev/zip$i: $!");
[ "/dev/zip$i", "/mnt/zip$i", "auto", "user,noauto,nosuid,exec,nodev", 0, 0 ];
- } detect_devices::zips());
+ } detect_devices::zips()));
write_fstab($fstab, $prefix, @to_add);
}