sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Jaka Kranjc (3c4d272079cb0ce28afb5fe4bd16e5b905d1005b)
- From: Jaka Kranjc <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (3c4d272079cb0ce28afb5fe4bd16e5b905d1005b)
- Date: Thu, 9 Aug 2007 07:59:01 -0500
GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:
utils/util-linux/HISTORY | 3 +++
utils/util-linux/PRE_INSTALL | 13 ++++++-------
2 files changed, 9 insertions(+), 7 deletions(-)
New commits:
commit 3c4d272079cb0ce28afb5fe4bd16e5b905d1005b
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
util-linux: fix #13926 for good
diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY
index 9f77cfb..f0815e5 100644
--- a/utils/util-linux/HISTORY
+++ b/utils/util-linux/HISTORY
@@ -1,3 +1,6 @@
+2007-08-09 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * PRE_INSTALL: fix #13926 for good
+
2007-08-08 Treeve Jelbert <treeve AT sourcemage.org>
* PRE_INSTALL: fix typo, fixes bug #13926
diff --git a/utils/util-linux/PRE_INSTALL b/utils/util-linux/PRE_INSTALL
index e40c9bc..ab35723 100755
--- a/utils/util-linux/PRE_INSTALL
+++ b/utils/util-linux/PRE_INSTALL
@@ -1,7 +1,6 @@
-# ensure that mount is available for staged install
-local SVMNT &&
-SVMNT=$SOURCE_DIRECTORY/old.bin &&
-mkdir -p $SVMNT &&
-cp /bin/mount /bin/umount $SVMNT &&
-PATH=$PATH:$SVMNT &&
-default_pre_install
+default_pre_install &&
+# ensure that mount is available - needed for and only for staged install
+# older sorceries don't have this backup
+if [[ -d $SOURCE_DIRECTORY/old.binaries ]]; then
+ cp $SOURCE_DIRECTORY/old.binaries/bin/*mount $INSTALL_ROOT/bin/
+fi
- [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (3c4d272079cb0ce28afb5fe4bd16e5b905d1005b), Jaka Kranjc, 08/09/2007
Archive powered by MHonArc 2.6.24.