summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/install/Makefile1
-rw-r--r--rescue/NEWS1
-rwxr-xr-xrescue/make_rescue_img5
3 files changed, 7 insertions, 0 deletions
diff --git a/perl-install/install/Makefile b/perl-install/install/Makefile
index 62a17b6c1..1756566b0 100644
--- a/perl-install/install/Makefile
+++ b/perl-install/install/Makefile
@@ -108,6 +108,7 @@ stage2:
mkdir -p $(DEST)/usr
$(MAKE) get_needed_files
$(MAKE) install_pms
+ # / -> /usr move
for i in bin ; do mv $(DEST)/$$i/* $(DEST)/usr/$$i; rmdir $(DEST)/$$i; ln -s /usr/$$i $(DEST); done
dont_run_directly_stage2:
diff --git a/rescue/NEWS b/rescue/NEWS
index 8cc7c22a8..f64a8ea54 100644
--- a/rescue/NEWS
+++ b/rescue/NEWS
@@ -1,5 +1,6 @@
- adapt to latest systemd/udevd
- adapt to perl-5.16.0
+- adapt to /usr move
- default to the higher version when there're several mga roots (mga#6003)
- fix detecting USB devices with kernel-3.5+ (mga#7248)
- revert to "linux" terminfo
diff --git a/rescue/make_rescue_img b/rescue/make_rescue_img
index 66deed0fa..fa5342f1f 100755
--- a/rescue/make_rescue_img
+++ b/rescue/make_rescue_img
@@ -20,6 +20,11 @@ _ "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";