diff options
| author | Francois Pons <fpons@mandriva.com> | 2003-03-26 15:47:01 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2003-03-26 15:47:01 +0000 |
| commit | e1e9c1f1147632f77b842087e4245e9e6e5a84d0 (patch) | |
| tree | 051304f180baa3fbb45ca23a047b3b578949160d | |
| parent | 93e8f893a0642ed041a24166e00ea02e01ddbb8b (diff) | |
| download | drakx-backup-do-not-use-e1e9c1f1147632f77b842087e4245e9e6e5a84d0.tar drakx-backup-do-not-use-e1e9c1f1147632f77b842087e4245e9e6e5a84d0.tar.gz drakx-backup-do-not-use-e1e9c1f1147632f77b842087e4245e9e6e5a84d0.tar.bz2 drakx-backup-do-not-use-e1e9c1f1147632f77b842087e4245e9e6e5a84d0.tar.xz drakx-backup-do-not-use-e1e9c1f1147632f77b842087e4245e9e6e5a84d0.zip | |
removed acpi reference here (should already been have removed earlier).
moved here hdInstallPath from install_any.
| -rw-r--r-- | perl-install/any.pm | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index b08e405c3..39b10df6b 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -74,6 +74,12 @@ sub enableShadow { run_program::rooted($prefix, "grpconv") or log::l("grpconv failed"); } +sub hdInstallPath() { + my $tail = first(readlink("/tmp/image") =~ m|^/tmp/hdimage/(.*)|); + my $head = first(readlink("/tmp/hdimage") =~ m|$::prefix(.*)|); + $tail && ($head ? "$head/$tail" : "/mnt/hd/$tail"); +} + sub kernelVersion { my $kernel = readlink "$::prefix/boot/vmlinuz" || first(all("$::prefix/boot")); first($kernel =~ /vmlinuz-(.*)/); @@ -309,11 +315,6 @@ sub setupBootloader__general { bootloader::set_profiles($b, $profiles); bootloader::set_append($b, "mem", $memsize); - if ($force_acpi) { - $in->do_pkgs->install(qw(acpi acpid)); - -x "$::prefix/usr/bin/acpi" && -x "$::prefix/usr/sbin/acpid" or $force_acpi = 0; - $force_acpi or log::l("deactivating acpi as no acpi nor acpid packages are present"); - } if ($prev_force_acpi != $force_acpi) { bootloader::set_append($b, acpi => ($force_acpi ? '' : 'off')); } |