Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (beb44de8199980db45e67d96c956fcd4fafc1699)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (beb44de8199980db45e67d96c956fcd4fafc1699)
  • Date: Fri, 13 Jan 2012 10:09:32 -0600

GIT changes to master grimoire by Ladislav Hagara <hgr AT vabo.cz>:

utils/util-linux/FINAL | 9 +++++++++
utils/util-linux/HISTORY | 2 +-
utils/util-linux/PRE_BUILD | 9 +--------
3 files changed, 11 insertions(+), 9 deletions(-)

New commits:
commit beb44de8199980db45e67d96c956fcd4fafc1699
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

util-linux now needs ttyX in /etc/inittab without /dev, #110

commit 228fc8df82344484785192f2b53c9e1cbd1647a7
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

Revert "util-linux now needs ttyX in /etc/inittab without /dev, #110"

This reverts commit 693e163c1a9e6c1c3e43ce3cd041cadb67d0e898.

FINAL is better place for this than PRE_BUILD.

diff --git a/utils/util-linux/FINAL b/utils/util-linux/FINAL
index 3d4d117..7ebc168 100755
--- a/utils/util-linux/FINAL
+++ b/utils/util-linux/FINAL
@@ -1,3 +1,12 @@
+# util-linux 2.20 needs ttyX in /etc/inittab without /dev
+# http://www.sourcemage.org/issues/110
+if [ "${VERSION:0:4}" == "2.20" ] && [ "${OLD_SPELL_VERSION:0:4}" == "2.19"
]; then
+ message "New version of util-linux needs to update /etc/inittab ..." &&
+ cp $INSTALL_ROOT/etc/inittab $INSTALL_ROOT/etc/inittab-$(date
+'%Y%m%d%H%M') &&
+ sed -i "s:/dev/tty:tty:" $INSTALL_ROOT/etc/inittab &&
+ message "Updated"
+fi &&
+
if test -f "$INSTALL_ROOT/etc/sysconfig/hwclock" && [[ $UTC ]]; then
sed -i "s/^UTC=.*$/UTC=$UTC/" "$INSTALL_ROOT/etc/sysconfig/hwclock"
fi
diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY
index fe95595..453388b 100644
--- a/utils/util-linux/HISTORY
+++ b/utils/util-linux/HISTORY
@@ -3,7 +3,7 @@
* util-linux.gpg: added with key EC39C284 (Karel Zak
<kzak AT redhat.com>)
http://www.spinics.net/lists/util-linux-ng/msg05331.html
http://people.redhat.com/kzak/README.html
- * PRE_BUILD: /etc/inittab updated for util-linux 2.20, #110
+ * PRE_BUILD, FINAL: /etc/inittab updated for util-linux 2.20, #110

2011-08-30 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.20
diff --git a/utils/util-linux/PRE_BUILD b/utils/util-linux/PRE_BUILD
index 324639d..56366db 100755
--- a/utils/util-linux/PRE_BUILD
+++ b/utils/util-linux/PRE_BUILD
@@ -5,13 +5,6 @@ if [[ $UL_VERSION == aes ]]; then
bzcat "$SOURCE_CACHE/$SOURCE3" | patch -p1
fi &&

-# util-linux 2.20 needs ttyX in /etc/inittab without /dev
-# http://www.sourcemage.org/issues/110
+# OLD_SPELL_VERSION is needed in FINAL
local OLD_SPELL_VERSION=""
spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)"
-if [ "${VERSION:0:4}" == "2.20" ] && [ "${OLD_SPELL_VERSION:0:4}" == "2.19"
]; then
- message "New version of util-linux needs to update /etc/inittab ..." &&
- cp $INSTALL_ROOT/etc/inittab $INSTALL_ROOT/etc/inittab-$(date
+'%Y%m%d%H%M') &&
- sed -i "s:/dev/tty:tty:" $INSTALL_ROOT/etc/inittab &&
- message "Updated"
-fi



  • [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (beb44de8199980db45e67d96c956fcd4fafc1699), Ladislav Hagara, 01/13/2012

Archive powered by MHonArc 2.6.24.

Top of Page