summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-09-25 16:08:59 +0000
committerOlivier Blin <oblin@mandriva.com>2008-09-25 16:08:59 +0000
commitdf33bff820f49cae79519feb8dc1557f85bf3129 (patch)
treed12a285a8e046a949c673a502b84d305d7c0ceb4
parent094bbd66fc9bed348bce52f31f14a9b1c88215fe (diff)
downloaddrakx-df33bff820f49cae79519feb8dc1557f85bf3129.tar
drakx-df33bff820f49cae79519feb8dc1557f85bf3129.tar.gz
drakx-df33bff820f49cae79519feb8dc1557f85bf3129.tar.bz2
drakx-df33bff820f49cae79519feb8dc1557f85bf3129.tar.xz
drakx-df33bff820f49cae79519feb8dc1557f85bf3129.zip
drakx-in-chroot: do not require running kernel to be installed, generate empty modules.dep and modules.alias files instead (useful when running drakx-in-chroot from a chroot)
-rw-r--r--perl-install/install/NEWS3
-rwxr-xr-xtools/drakx-in-chroot2
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 4bda3127f..b297f3317 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -2,6 +2,9 @@
(since we don't propose "Save packages selection" at end of install)
- generate /var/lib/rpm/installed-through-deps.list
(to initialize urpmi orphans)
+- drakx-in-chroot: do not require running kernel to be installed,
+ generate empty modules.dep and modules.alias files instead
+ (useful when running drakx-in-chroot from a chroot)
Version 11.53.2 - 25 September 2008
diff --git a/tools/drakx-in-chroot b/tools/drakx-in-chroot
index 54510f59a..5feac78e9 100755
--- a/tools/drakx-in-chroot
+++ b/tools/drakx-in-chroot
@@ -95,7 +95,7 @@ eval { cp_af($_, "$SLASH_LOCATION$_") } foreach qw(/etc/resolv.conf);
chomp(my $kernel_version = `uname -r`);
my $dir = "/modules/$kernel_version";
mkdir_p("$SLASH_LOCATION$dir");
- cp_af("/lib/$dir/modules.dep", "/lib/$dir/modules.alias", "$SLASH_LOCATION$dir");
+ output_p("$SLASH_LOCATION$dir" . $_, "\n") foreach "/lib/$dir/modules.dep", "/lib/$dir/modules.alias";
}
my $Xnest_pid;