summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2007-12-13 17:01:36 +0000
committerOlivier Blin <oblin@mandriva.com>2007-12-13 17:01:36 +0000
commitac76bff5c5aa0856549962c99661c3ac26c87081 (patch)
tree15b58b1317c7924b7d4e369a6358da62e541bb5b
parente9eaf1968741f6795624a90efb4f0180a9cdca14 (diff)
downloaddraklive-ac76bff5c5aa0856549962c99661c3ac26c87081.tar
draklive-ac76bff5c5aa0856549962c99661c3ac26c87081.tar.gz
draklive-ac76bff5c5aa0856549962c99661c3ac26c87081.tar.bz2
draklive-ac76bff5c5aa0856549962c99661c3ac26c87081.tar.xz
draklive-ac76bff5c5aa0856549962c99661c3ac26c87081.zip
remove now useless lib_prefix cruft
-rwxr-xr-xdraklive16
1 files changed, 1 insertions, 15 deletions
diff --git a/draklive b/draklive
index 3121b63..31736bf 100755
--- a/draklive
+++ b/draklive
@@ -430,20 +430,8 @@ sub create_initrd_for_media {
my $initrd_tree = get_builddir($live) . $live->{prefix}{build}{initrd} . '/' . $media->{storage};
rm_rf($initrd_tree) if -e $initrd_tree;
- my ($lib_prefix, $need_libs, @libs);
- foreach (qw(/lib64 /lib)) {
- my @ld = glob(get_system_root($live) . $_ . '/ld-*.so.*');
- my @libc = glob(get_system_root($live) . $_ . '/libc.so.*');
- if (@ld && @libc) {
- @libs = (@ld, @libc);
- $lib_prefix = $_;
- last;
- }
- }
- $lib_prefix or die "unable to find system libraries in /lib or /lib64\n";
-
mkdir_p($initrd_tree . $_) foreach
- qw(/bin /dev /modules /proc /sys /tmp), $lib_prefix,
+ qw(/bin /dev /modules /proc /sys /tmp),
map { $live->{prefix}{live}{mnt} . $_ }
$live->{prefix}{media}{mnt},
$live->{mount}{root},
@@ -479,8 +467,6 @@ sub create_initrd_for_media {
inst_initrd_bin(get_system_root($live), $initrd_tree, '/usr/bin/strace') if $live->{debug};
- cp_f(@libs, $initrd_tree . $lib_prefix) if $need_libs;
-
output_p($initrd_tree . '/etc/fstab', '');
output_p($initrd_tree . '/etc/mtab', '');