summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2012-10-22 20:07:17 +0000
committerColin Guthrie <colin@mageia.org>2012-10-22 20:07:17 +0000
commit70979999a3f65fa95cd987f15fc31b1cfa0c58c1 (patch)
treee51f314faa316706b4f890aeaa530b7a4d4de0fe
parent832b60a4c083dcb244f7cb17aa0aabffa3cfaa82 (diff)
downloaddrakx-70979999a3f65fa95cd987f15fc31b1cfa0c58c1.tar
drakx-70979999a3f65fa95cd987f15fc31b1cfa0c58c1.tar.gz
drakx-70979999a3f65fa95cd987f15fc31b1cfa0c58c1.tar.bz2
drakx-70979999a3f65fa95cd987f15fc31b1cfa0c58c1.tar.xz
drakx-70979999a3f65fa95cd987f15fc31b1cfa0c58c1.zip
Ensure the filesystem is converted for usrmove on upgrade
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/install/share/list.xml8
-rw-r--r--perl-install/install/steps.pm8
3 files changed, 17 insertions, 0 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index e4cc96cbe..5d3d8d106 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,4 +1,5 @@
- prefer real binaries over the lightweight perl wrappers
+- convert filesystem for usrmove during upgrades
Version 14.48 - 22 October 2012
diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml
index b83ce0877..59f7e8db0 100644
--- a/perl-install/install/share/list.xml
+++ b/perl-install/install/share/list.xml
@@ -335,6 +335,14 @@
gconv-modules
</from>
+<!-- For the usrmove -->
+<from>
+ /usr/lib/dracut/modules.d/30convertfs/convertfs.sh
+</from>
+<from expand="binary">
+ find bash ldconfig mv rm cp ln
+</from>
+
<filter subst="/^__END__/ and $_ = '', close ARGV">
<from expand="main-perl">
AutoLoader.pm
diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
index c3cac095e..f006e5f6d 100644
--- a/perl-install/install/steps.pm
+++ b/perl-install/install/steps.pm
@@ -337,6 +337,14 @@ sub beforeInstallPackages {
foreach (@filesNewerToUseAfterUpgrade) {
unlink "$::prefix/$_.rpmnew";
}
+
+ log::l("converting filesystem for usrmove");
+ if (!run_program::run('/usr/lib/dracut/modules.d/30convertfs/convertfs.sh', $::prefix)) {
+ mkdir_p("$::prefix/root/drakx") if ! -d "$::prefix/root/drakx";
+ # logs are only copied to $::prefix/root/drakx at the end of each step, so do it manually now
+ eval { cp_af("/tmp/ddebug.log", "$::prefix/root/drakx") };
+ die "Unable to convert filesystem prior to upgrade. Check ddebug.log for details";
+ }
}
#- mainly for upgrading redhat packages, but it can help other