diff --git a/utils/util-linux/CONFIGURE b/utils/util-linux/CONFIGURE
index df6572b..3b00f63 100755
--- a/utils/util-linux/CONFIGURE
+++ b/utils/util-linux/CONFIGURE
@@ -1,32 +1,3 @@
-. "$GRIMOIRE/FUNCTIONS" &&
-
-local OLD_SPELL_VERSION="" &&
-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
$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
- message "${PROBLEM_COLOR}" &&
- message "WARNING: $INSTALL_ROOT/etc/inittab needs syntax update. You
need to" &&
- message "replace all '/dev/tty*' lines to 'tty*' equivalents, e.g.:" &&
- message "${MESSAGE_COLOR}Before: tty1:linux:/sbin/agetty /dev/tty1 9600"
&&
- message "After: tty1:linux:/sbin/agetty tty1 9600${PROBLEM_COLOR}" &&
- message "Press 'n' to abort cast and do that manually by editing" &&
- message "$INSTALL_ROOT/etc/inittab file under superuser, then recast
$SPELL." &&
- message "${DEFAULT_COLOR}" &&
-
- if ! query "Attempt to replace the lines automatically?" n; then
- return 1
- else
- persistent_add UL_DEV_AUTOREPLACE &&
- local UL_DEV_AUTOREPLACE="y"
- fi
- fi
-fi &&
-
if [[ ! -e "$INSTALL_ROOT/etc/sysconfig/hwclock" ]]; then
config_query UTC "Should the hardware clock store time in UTC (may break
systems like MS Windows)?" y
fi
diff --git a/utils/util-linux/DETAILS b/utils/util-linux/DETAILS
index 969e6bf..b31d6c8 100755
--- a/utils/util-linux/DETAILS
+++ b/utils/util-linux/DETAILS
@@ -12,9 +12,9 @@ if [[ $UL_VERSION == aes ]]; then
SOURCE3_GPG=loop-AES.gpg:$SOURCE4:UPSTREAM_KEY
SOURCE4_IGNORE=signature
else
- VERSION=2.21.1
+ VERSION=2.21.2
SECURITY_PATCH=2
-
SOURCE_HASH=sha512:e2eb79ad68225aa27367f516b40a1ea280b6cef4bf49f58507a033ba85f0ff4bafd4bd50a8d5febbb7700c5e41945e797961558b970c54abbe7618b1aa887129
+
SOURCE_HASH=sha512:d6499636b40e22f72b957e0334faefce51656a4d8f8dc038c17d24b03d84e50917112a47a18c6601a048d041263714092ecffbd269d41699a4bdb86a89bc3e30
fi
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY
index 726c081..ee46ca2 100644
--- a/utils/util-linux/HISTORY
+++ b/utils/util-linux/HISTORY
@@ -1,3 +1,10 @@
+2012-10-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * CONFIGURE, PREPARE: prevent triggerring from other spells for
+ migrating process
+
+2012-05-25 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.21.2
+
2012-05-18 Vlad Glagolev <stealth AT sourcemage.org>
* POST_INSTALL: removed, this still must be made in FINAL to not to
be tracked by sorcery
diff --git a/utils/util-linux/PREPARE b/utils/util-linux/PREPARE
index 13921a1..63612c1 100755
--- a/utils/util-linux/PREPARE
+++ b/utils/util-linux/PREPARE
@@ -1,3 +1,34 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+
message "aes version is older usually, but needed for loop-AES patch" &&
-config_query_list UL_VERSION "What version do you want to use?" latest aes
+config_query_list UL_VERSION "What version do you want to use?" \
+ latest \
+ aes &&
+
+local OLD_SPELL_VERSION="" &&
+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
$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
+ message "${PROBLEM_COLOR}" &&
+ message "WARNING: $INSTALL_ROOT/etc/inittab needs syntax update. You
need to" &&
+ message "replace all '/dev/tty*' lines to 'tty*' equivalents, e.g.:" &&
+ message "${MESSAGE_COLOR}Before: tty1:linux:/sbin/agetty /dev/tty1 9600"
&&
+ message "After: tty1:linux:/sbin/agetty tty1 9600${PROBLEM_COLOR}" &&
+ message "Press 'n' to abort cast and do that manually by editing" &&
+ message "$INSTALL_ROOT/etc/inittab file under superuser, then recast
$SPELL." &&
+ message "${DEFAULT_COLOR}" &&
+
+ if ! query "Attempt to replace the lines automatically?" n; then
+ return 1
+ else
+ persistent_add UL_DEV_AUTOREPLACE &&
+ local UL_DEV_AUTOREPLACE="y"
+ fi
+ fi
+fi
[SM-Commit] GIT changes to stable-0.61 grimoire by Vlad Glagolev (2c43c0324357915c7ab39bd5bf2a940f6c173680),
Vlad Glagolev, 10/14/2012