From 645e6932216fddd154865a9bebb0fd0e3beed301 Mon Sep 17 00:00:00 2001
From: Colin Guthrie <colin@mageia.org>
Date: Sun, 1 Dec 2013 20:57:39 +0000
Subject: rescue: Avoid having to run dracut convertfs script by setting up the
 tree.

We can easily avoid post processing the tree simply by moving the tree around
and ensuring we set it up correctly (with the compat symlinks) early in the
process.
---
 rescue/make_rescue_img | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'rescue/make_rescue_img')

diff --git a/rescue/make_rescue_img b/rescue/make_rescue_img
index 18c045acb..432a6cf94 100755
--- a/rescue/make_rescue_img
+++ b/rescue/make_rescue_img
@@ -15,20 +15,23 @@ BEGIN { undef *_ }
 sub __ { print @_, "\n"; system(@_) }
 sub _ { __ @_; $? and die }
 
+my $arch = arch() =~ /i.86/ ? $MDK::Common::System::compat_arch{arch()} : arch();
 _ "rm -rf $tmp" if -e $tmp;
-_ "mkdir $tmp";
+_ "mkdir -p $tmp/usr/{bin,sbin,lib}";
+_ "ln -s usr/bin $tmp/bin";
+_ "ln -s usr/sbin $tmp/sbin";
+_ "ln -s usr/lib $tmp/lib";
+if ($arch eq "x86_64") {
+    _ "mkdir $tmp/usr/lib64";
+    _ "ln -s usr/lib64 $tmp/lib64";
+}
 _ 'find . -name "*~" | xargs rm -f';
 mkdir_p($tmp . chomp_($_)) foreach cat_("dirs");
 _ "cp -a tree/* $tmp";
-_ "find $tmp -name .svn | xargs rm -rf";
 substInFile { s/DISTRIB_DESCR/$ENV{DISTRIB_DESCR}/ } "$tmp/etc/issue";
 
 _ "../tools/install-xml-file-list list.xml $tmp";
 
-# / -> /usr move
-_ "mkdir -p $tmp/usr/{,s}bin";
-_ "/usr/lib/dracut/modules.d/30convertfs/convertfs.sh $tmp";
-
 my %keytable_conflicts;
 my @less_important_keytables = qw(am_old am_phonetic no-dvorak de-latin1);
 foreach (keyboard::loadkeys_files(sub { warn @_ })) {
-- 
cgit v1.2.1