summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2001-10-29 22:19:35 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2001-10-29 22:19:35 +0000
commit46ff954145221fca4a574da60c65eb3a7b8eb1e6 (patch)
tree26a5437f5d3f7aa04393d9875d5ed781cc4e1db7
parente3463832c394be7b55eb840ebc3eed439c2a7c11 (diff)
downloaddrakx-46ff954145221fca4a574da60c65eb3a7b8eb1e6.tar
drakx-46ff954145221fca4a574da60c65eb3a7b8eb1e6.tar.gz
drakx-46ff954145221fca4a574da60c65eb3a7b8eb1e6.tar.bz2
drakx-46ff954145221fca4a574da60c65eb3a7b8eb1e6.tar.xz
drakx-46ff954145221fca4a574da60c65eb3a7b8eb1e6.zip
revert back to /initrd
-rw-r--r--perl-install/bootloader.pm4
-rw-r--r--perl-install/fs.pm8
-rw-r--r--perl-install/fsedit.pm2
-rw-r--r--perl-install/loopback.pm8
4 files changed, 11 insertions, 11 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index d3dcc43d6..c2a75e8dc 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -392,7 +392,7 @@ wait %d seconds for default boot.
silo => to_bool(arch() =~ /sparc/),
lilo => to_bool(arch() !~ /sparc|ppc/) && !isLoopback(fsedit::get_root($fstab)),
grub => to_bool(arch() !~ /sparc|ppc/ && !isRAID(fsedit::get_root($fstab))),
- loadlin => to_bool(arch() !~ /sparc|ppc/) && -e "/lib/initrd/loopfs/lnx4win",
+ loadlin => to_bool(arch() !~ /sparc|ppc/) && -e "/initrd/loopfs/lnx4win",
);
unless ($lilo->{methods}) {
$lilo->{methods} ||= { map { $_ => 1 } grep { $l{$_} } keys %l };
@@ -905,7 +905,7 @@ sub install_loadlin {
#install_loadlin_config_sys($lilo, $windrive, $label, $cmd);
#install_loadlin_desktop($lilo, $windrive);
- output "/lib/initrd/loopfs/lnx4win/linux.bat", unix2dos(
+ output "/initrd/loopfs/lnx4win/linux.bat", unix2dos(
'@echo off
echo Mandrake Linux
smartdrv /C
diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index 843cd144d..88792c312 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -142,7 +142,7 @@ sub write_fstab {
$_->{device} eq 'none' || member($_->{type}, qw(nfs smbfs)) ?
$_->{device} :
isLoopback($_) ?
- ($_->{mntpoint} eq '/' ? "/lib/initrd/loopfs" : "$_->{loopback_device}{mntpoint}") . $_->{loopback_file} :
+ ($_->{mntpoint} eq '/' ? "/initrd/loopfs" : "$_->{loopback_device}{mntpoint}") . $_->{loopback_file} :
do {
my $dir = $_->{device} =~ m|^/| ? '' : '/dev/';
eval { devices::make("$prefix$dir$_->{device}") };
@@ -151,7 +151,7 @@ sub write_fstab {
my $real_mntpoint = $_->{mntpoint} || ${{ '/tmp/hdimage' => '/mnt/hd' }}{$_->{real_mntpoint}};
mkdir("$prefix/$real_mntpoint", 0755);
- my $mntpoint = loopback::carryRootLoopback($_) ? '/lib/initrd/loopfs' : $real_mntpoint;
+ my $mntpoint = loopback::carryRootLoopback($_) ? '/initrd/loopfs' : $real_mntpoint;
my ($freq, $passno) =
exists $_->{freq} ?
@@ -662,7 +662,7 @@ sub mount_part {
eval { modules::load('loop') };
$dev = $part->{real_device} = devices::set_loop($part->{device}) || die;
} elsif (loopback::carryRootLoopback($part)) {
- $mntpoint = "/lib/initrd/loopfs";
+ $mntpoint = "/initrd/loopfs";
}
mount($dev, $mntpoint, type2fs($part), $rdonly);
rmdir "$mntpoint/lost+found";
@@ -680,7 +680,7 @@ sub umount_part {
if (isSwap($part)) {
swap::swapoff($part->{device});
} elsif (loopback::carryRootLoopback($part)) {
- umount("/lib/initrd/loopfs");
+ umount("/initrd/loopfs");
} else {
umount(($prefix || '') . $part->{mntpoint} || devices::make($part->{device}));
c::del_loop(delete $part->{real_device}) if isLoopback($part);
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index 1dc4c9990..1061fb7a0 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -341,7 +341,7 @@ sub file2part {
unless ($file =~ s/^$prefix//) {
my ($part) = grep { loopback::carryRootLoopback($_) } @$fstab or die;
log::l("found $part->{mntpoint}");
- $file =~ s|/lib/initrd/loopfs|$part->{mntpoint}|;
+ $file =~ s|/initrd/loopfs|$part->{mntpoint}|;
}
foreach (@$fstab) {
my $m = $_->{mntpoint};
diff --git a/perl-install/loopback.pm b/perl-install/loopback.pm
index a7763aa9c..24c519ecb 100644
--- a/perl-install/loopback.pm
+++ b/perl-install/loopback.pm
@@ -50,13 +50,13 @@ sub carryRootCreateSymlink {
unless (-e $mntpoint) {
eval { mkdir_p(dirname($mntpoint)) };
#- do non-relative link for install, should be changed to relative link before rebooting
- symlink "/lib/initrd/loopfs", $mntpoint;
+ symlink "/initrd/loopfs", $mntpoint;
- mkdir_p("/lib/initrd/loopfs/lnx4win/boot");
- symlink "/lib/initrd/loopfs/lnx4win/boot", "$prefix/boot";
+ mkdir_p("/initrd/loopfs/lnx4win/boot");
+ symlink "/initrd/loopfs/lnx4win/boot", "$prefix/boot";
}
#- indicate kernel to keep initrd
- mkdir "$prefix/lib/initrd", 0755;
+ mkdir "$prefix/initrd", 0755;
}