Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (fbb7b6a539eae655bccdec8661e470061769a416)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (fbb7b6a539eae655bccdec8661e470061769a416)
  • Date: Thu, 17 May 2012 10:28:06 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

utils/util-linux/CONFIGURE | 7 +++----
utils/util-linux/HISTORY | 5 +++++
utils/util-linux/POST_INSTALL | 7 +++++++
3 files changed, 15 insertions(+), 4 deletions(-)

New commits:
commit fbb7b6a539eae655bccdec8661e470061769a416
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

util-linux: autofix /etc/inittab only on successful installation of new
util-linux version

diff --git a/utils/util-linux/CONFIGURE b/utils/util-linux/CONFIGURE
index 1e8f012..df6572b 100755
--- a/utils/util-linux/CONFIGURE
+++ b/utils/util-linux/CONFIGURE
@@ -5,7 +5,7 @@ spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version
$SPELL)" &&

# util-linux 2.20 needs ttyX in /etc/inittab without /dev
# http://www.sourcemage.org/issues/110
-message "${MESSAGE_COLOR}Checking sanity of /etc/inittab...${DEFAULT_COLOR}"
&&
+message "${MESSAGE_COLOR}Checking sanity of
$INSTALL_ROOT/etc/inittab...${DEFAULT_COLOR}" &&

if grep -iq "/dev/tty" "$INSTALL_ROOT/etc/inittab"; then
if is_version_less ${OLD_SPELL_VERSION} 2.20 && is_version_less 2.19.1
${VERSION}; then
@@ -21,9 +21,8 @@ if grep -iq "/dev/tty" "$INSTALL_ROOT/etc/inittab"; then
if ! query "Attempt to replace the lines automatically?" n; then
return 1
else
- cp $INSTALL_ROOT/etc/inittab $INSTALL_ROOT/etc/inittab-$(date
+'%Y%m%d%H%M') &&
- sedit "s:/dev/tty:tty:g" "$INSTALL_ROOT/etc/inittab" &&
- message "${MESSAGE_COLOR}Updated${DEFAULT_COLOR}"
+ persistent_add UL_DEV_AUTOREPLACE &&
+ local UL_DEV_AUTOREPLACE="y"
fi
fi
fi &&
diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY
index 8cdaf26..5b94165 100644
--- a/utils/util-linux/HISTORY
+++ b/utils/util-linux/HISTORY
@@ -1,3 +1,8 @@
+2012-05-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * CONFIGURE: moved real actions to POST_INSTALL
+ * POST_INSTALL: added, to autofix /etc/inittab only on successful
+ installation of new util-linux version
+
2012-05-14 Vlad Glagolev <stealth AT sourcemage.org>
* CONFIGURE, PRE_BUILD, FINAL: properly handle /etc/inittab upgrade

diff --git a/utils/util-linux/POST_INSTALL b/utils/util-linux/POST_INSTALL
new file mode 100755
index 0000000..ed1c955
--- /dev/null
+++ b/utils/util-linux/POST_INSTALL
@@ -0,0 +1,7 @@
+if [[ $UL_DEV_AUTOREPLACE == y ]]; then
+ cp -v $INSTALL_ROOT/etc/inittab $INSTALL_ROOT/etc/inittab-$(date
+'%Y%m%d%H%M') &&
+ message -n "${MESSAGE_COLOR}Updating /etc/inittab... " &&
+ sedit "s:/dev/tty:tty:g" "$INSTALL_ROOT/etc/inittab" &&
+ message "DONE${DEFAULT_COLOR}" &&
+ persistent_remove UL_DEV_AUTOREPLACE
+fi



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (fbb7b6a539eae655bccdec8661e470061769a416), Vlad Glagolev, 05/17/2012

Archive powered by MHonArc 2.6.24.

Top of Page