summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-04-06 04:55:16 +0000
committerThierry Vignaud <tv@mageia.org>2013-04-06 04:55:16 +0000
commitdd588b0df21a5fb4454b9f31ea67215e5669eac5 (patch)
treeb5897321c9c061f33c883a87f351c76d76d7cf18
parenta4bb8555e8dd6b631e5ddb7d5f4c0be4ec937a83 (diff)
downloaddrakx-dd588b0df21a5fb4454b9f31ea67215e5669eac5.tar
drakx-dd588b0df21a5fb4454b9f31ea67215e5669eac5.tar.gz
drakx-dd588b0df21a5fb4454b9f31ea67215e5669eac5.tar.bz2
drakx-dd588b0df21a5fb4454b9f31ea67215e5669eac5.tar.xz
drakx-dd588b0df21a5fb4454b9f31ea67215e5669eac5.zip
really adapt to /usr move (fix lvm2 freezing, mga#5795)
-rw-r--r--rescue/NEWS1
-rwxr-xr-xrescue/make_rescue_img9
2 files changed, 5 insertions, 5 deletions
diff --git a/rescue/NEWS b/rescue/NEWS
index b8d18468e..aeb6346aa 100644
--- a/rescue/NEWS
+++ b/rescue/NEWS
@@ -1,3 +1,4 @@
+- really adapt to /usr move (fix lvm2 freezing, mga#5795)
- drop our "use modprobe instead" insmod since we've kmod one for free
- include libdevmapper-event-*.so
- include persistant storage udev rules needed to see new uuids
diff --git a/rescue/make_rescue_img b/rescue/make_rescue_img
index fa5342f1f..18c045acb 100755
--- a/rescue/make_rescue_img
+++ b/rescue/make_rescue_img
@@ -20,16 +20,15 @@ _ "mkdir $tmp";
_ 'find . -name "*~" | xargs rm -f';
mkdir_p($tmp . chomp_($_)) foreach cat_("dirs");
_ "cp -a tree/* $tmp";
-# / -> /usr move
-foreach (qw(bin sbin)) {
- rename("$tmp/$_", "$tmp/usr/$_");
- symlinkf("usr/$_", "$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 @_ })) {