Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] PERFORCE change 77951 by Matthew Clark for review

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • 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>, "Eric Sandall" <eric AT sandall.us>, "Ethan Grammatikidis" <eekee AT eekee.is-a-geek.org>, "Gareth Clay" <gareth AT caffeinefuelled.co.uk>, "Ladislav Hagara" <ladislav.hagara AT unob.cz>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Pol Vinogradov" <vin.public AT gmail.com>, "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 77951 by Matthew Clark for review
  • Date: Tue, 18 Apr 2006 18:55:02 +0100 (BST)

Change 77951 by matthew_clark@mclark-darebin on 2006/04/18 18:52:45

Integrate from devel

Affected files ...

... //sgl/grimoires/test/net/ppp/FINAL#4 integrate
... //sgl/grimoires/test/net/ppp/HISTORY#11 integrate
... //sgl/grimoires/test/net/ppp/resolv.conf#2 integrate

Differences ...

==== //sgl/grimoires/test/net/ppp/FINAL#4 (xtext) ====

@@ -1,7 +1,8 @@
if [ "$USE_PEER_DNS" == "y" ]; then
+ cat ${INSTALL_ROOT}/etc/resolv.conf >> /etc/ppp/resolv.conf &&
mv ${INSTALL_ROOT}/etc/resolv.conf \
${INSTALL_ROOT}/etc/resolv.conf.`date +%Y%m%d%k%M%S | sed 's: ::g'`
&&
- ln /etc/ppp/resolv.conf /etc/resolv.conf
+ ln -s /etc/ppp/resolv.conf /etc/resolv.conf
fi &&

message "${MESSAGE_COLOR}Please edit /etc/ppp/chat/isp and insert your\n"
\
@@ -16,4 +17,8 @@
"Use poff to terminate a ppp connection.\n"
\
"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"
+ "ln -s ttyS04 /dev/modem might work.\n"
\
+ "\n"
\
+ "NOTICE: Your current /etc/resolv.conf has been backed up, it's\n"
\
+ "contents have been copied to /etc/ppp/resolv.conf, and has been\n"
\
+ "replaced by a symbolic link to /etc/ppp/resolv.conf.\n"

==== //sgl/grimoires/test/net/ppp/HISTORY#11 (text) ====

@@ -1,3 +1,8 @@
+2006-04-18 Matthew Clark <MatthewClark AT SourceMage.org>
+ * Fixed bug 10409
+ * FINAL: Fixed bad resolv.conf handling, added notice to
+ inform user of changes to /etc/resolv.conf
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS


==== //sgl/grimoires/test/net/ppp/resolv.conf#2 (text) ====

@@ -1,0 +1,4 @@
+
+# Entries below this comment (if any)
+# were moved from /etc/resolv.conf
+# when the ppp spell was cast



  • [SM-Commit] PERFORCE change 77951 by Matthew Clark for review, Perforce Review Daemon, 04/18/2006

Archive powered by MHonArc 2.6.24.

Top of Page