sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Jeremy Blosser (2dd40856fb4ee8f07015dd298b1d4bc9a34867e5)
- From: Jeremy Blosser <scm AT mail.sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Jeremy Blosser (2dd40856fb4ee8f07015dd298b1d4bc9a34867e5)
- Date: Wed, 7 Feb 2007 15:20:57 -0600
GIT changes to master grimoire by Jeremy Blosser <jblosser-smgl AT firinn.org>:
security/shadow/CONFIGURE | 4 ++++
security/shadow/HISTORY | 5 +++++
2 files changed, 9 insertions(+)
New commits:
commit ac992cbabf4dbf0cb6eccb5392401f4b37fd2a84
Author: Jeremy Blosser <jblosser-smgl AT firinn.org>
Commit: Jeremy Blosser <jblosser-smgl AT firinn.org>
shadow: Don't try to chk non-existant files.
diff --git a/security/shadow/CONFIGURE b/security/shadow/CONFIGURE
index 2c754b2..b2b6f03 100755
--- a/security/shadow/CONFIGURE
+++ b/security/shadow/CONFIGURE
@@ -15,18 +15,22 @@ else
fi &&
if [[ "$SHADOW_CONV" == y ]] || [[ "$SHADOW_RECONV" == y ]]; then
message "OK, checking your user and group accounts" &&
+ if [ -f "$INSTALL_ROOT/etc/gshadow" ]; then
grpck -r "$INSTALL_ROOT/etc/group" "$INSTALL_ROOT/etc/gshadow" ||
{
message "there are problems with group... runinng grpck
interactively" &&
grpck "$INSTALL_ROOT/etc/group" "$INSTALL_ROOT/etc/gshadow"
}
+ fi
+ if [ -f "$INSTALL_ROOT/etc/shadow" ]; then
pwck -q -r "$INSTALL_ROOT/etc/passwd" "$INSTALL_ROOT/etc/shadow" ||
{
message "there are problems with passwd... runinng grpck
interactively" &&
grpck "$INSTALL_ROOT/etc/passwd" "$INSTALL_ROOT/etc/shadow"
}
+ fi
fi
# the tools give negative return even after successfully fixing stuff
true
diff --git a/security/shadow/HISTORY b/security/shadow/HISTORY
index fea9dcb..4fd7db3 100644
--- a/security/shadow/HISTORY
+++ b/security/shadow/HISTORY
@@ -1,3 +1,8 @@
+2007-02-07 Jeremy Blosser <jblosser-smgl AT firinn.org>
+ * CONFIGURE: Also don't bother trying to check files that aren't there
+ and are going to fail. May not be the best fix but for now it
avoids
+ scary errors when we say we're trying to repair things.
+
2007-02-07 Thomas Orgis <sobukus AT sourcemage.org>
* CONFIGURE,FINAL: integrated Jeremy's suggestion of making the
emergency query a one-timer
- [SM-Commit] GIT changes to master grimoire by Jeremy Blosser (2dd40856fb4ee8f07015dd298b1d4bc9a34867e5), Jeremy Blosser, 02/07/2007
Archive powered by MHonArc 2.6.24.