sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] PERFORCE change 79260 by Matthew Clark for review

From: Perforce Review Daemon <p4review AT smee.org>
To: "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT sourcemage.org>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Ethan Grammatikidis" <eekee AT eekee.is-a-geek.org>, "Gareth Clay" <gareth AT caffeinefuelled.co.uk>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Robin Cook" <rcook AT wyrms.net>, "Seth Woolley" <seth AT swoolley.homeip.net>, "Unet" <unet AT sourcemage.org>, "vladimir_marek" <vlmarek AT volny.cz>
Subject: [SM-Commit] PERFORCE change 79260 by Matthew Clark for review
Date: Sun, 14 May 2006 00:05:01 +0100 (BST)

Change 79260 by matthew_clark@mclark-aussie on 2006/05/14 00:00:16

Fixing bug 10409 (again) by enhancing message in FINAL

Affected files ...

... //sgl/grimoires/devel/net/ppp/FINAL#8 edit
... //sgl/grimoires/devel/net/ppp/HISTORY#19 edit

Differences ...

==== //sgl/grimoires/devel/net/ppp/FINAL#8 (xtext) ====

@@ -1,5 +1,13 @@
+# Does /etc/resolv.conf already exist?
+if [ -s ${INSTALL_ROOT}/etc/resolv.conf ]
+then
+ FILE_EXISTS=1
+else
+ FILE_EXISTS=0
+fi
+
if [ "$USE_PEER_DNS" == "y" ]; then
- if [ -s ${INSTALL_ROOT}/etc/resolv.conf ]
+ if [ $FILE_EXISTS ]
then
cat ${INSTALL_ROOT}/etc/resolv.conf >> /etc/ppp/resolv.conf &&
mv ${INSTALL_ROOT}/etc/resolv.conf \
@@ -21,7 +29,11 @@
"Read the man pages on ppp and chat for more information.\n"
\
"In some cases, perhaps an internal modem on a non-standard
port,\n" \
"ln -s ttyS04 /dev/modem might work.\n"
\
- "\n"
\
- "NOTICE: Your current /etc/resolv.conf (if it already existed)
has\n" \
- "been backed up, it's contents have been copied to\n"
\
- "/etc/ppp/resolv.conf, and has been replaced by a symbolic link.\n"
\
+ "\n"
&&
+
+if [ $FILE_EXISTS ]
+then
+message "NOTICE: Your current ${INSTALL_ROOT}/etc/resolv.conf has been\n"
\
+ "backed up, it's contents have been copied to
/etc/ppp/resolv.conf,\n"\
+ "and has been replaced by a symbolic link.\n"
+fi

==== //sgl/grimoires/devel/net/ppp/HISTORY#19 (text) ====

@@ -1,7 +1,10 @@
+2006-05-13 Matthew Clark <matthewclark AT inlesserterms.net>
+ * FINAL: Trying to enhance message, bug 10409
+
2006-04-23 Matthew Clark <matthewclark AT inlesserterms.net>
* Fixed reopened bug 10409
* FINAL: Made handling of /etc/resolv.conf smarter (in case
- it doesn't aready exist, the spell doesn't break)
+ it doesn't aready exist, the spell doesn't break)

2006-04-18 Matthew Clark <matthewclark AT inlesserterms.net>
* Fixed bug 10409

[SM-Commit] PERFORCE change 79260 by Matthew Clark for review, Perforce Review Daemon, 05/13/2006