aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/sysinstall/network.c
diff options
context:
space:
mode:
authorBrian Somers <brian@FreeBSD.org>1999-07-26 10:49:37 +0000
committerBrian Somers <brian@FreeBSD.org>1999-07-26 10:49:37 +0000
commit51f80ae148a9ffe731079681d85ad8810dfd77e5 (patch)
treec33e6d761db21e86c7ec6ad0e85d3cd55df855b6 /usr.sbin/sysinstall/network.c
parent4a9e5bd0dbb890d312896b1dec911c8cd861859d (diff)
Notes
Diffstat (limited to 'usr.sbin/sysinstall/network.c')
-rw-r--r--usr.sbin/sysinstall/network.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/usr.sbin/sysinstall/network.c b/usr.sbin/sysinstall/network.c
index c71f76b29e76..8edf030109f0 100644
--- a/usr.sbin/sysinstall/network.c
+++ b/usr.sbin/sysinstall/network.c
@@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated to essentially a complete rewrite.
*
- * $Id: network.c,v 1.36 1999/05/19 10:49:43 jkh Exp $
+ * $Id: network.c,v 1.37 1999/07/18 10:18:05 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -246,7 +246,7 @@ startPPP(Device *devp)
close(fd2);
}
if (!Fake)
- fp = fopen("/etc/ppp/ppp.conf", "w");
+ fp = fopen("/etc/ppp/ppp.conf", "a");
else
fp = fopen("/dev/stderr", "w");
if (!fp) {
@@ -268,7 +268,7 @@ startPPP(Device *devp)
dialog_clear_norefresh();
pulse = dialog_yesno("", "Does your telephone line support tone dialing?", -1, -1);
}
- fprintf(fp, "default:\n");
+ fprintf(fp, "\ninstall:\n");
fprintf(fp, " set speed %s\n", speed);
fprintf(fp, " set device %s\n", devp->devname);
fprintf(fp, " set ifaddr %s %s\n", myaddr, provider);
@@ -282,10 +282,14 @@ startPPP(Device *devp)
fprintf(fp, " set authkey %s\n", authkey);
fprintf(fp, " set phone %s\n", phone);
}
- if (fchmod(fileno(fp), 0640) != 0)
+ if (fchmod(fileno(fp), 0600) != 0)
msgConfirm("Warning: Failed to fix permissions on /etc/ppp/ppp.conf !");
fclose(fp);
+ /* Make the ppp config persistent */
+ variable_set2(VAR_PPP_ENABLE, "YES", 0);
+ variable_set2(VAR_PPP_PROFILE, "install", 0);
+
if (!Fake && !file_readable("/dev/tun0") && mknod("/dev/tun0", 0600 | S_IFCHR, makedev(52, 0))) {
msgConfirm("Warning: No /dev/tun0 device. PPP will not work!");
return 0;
@@ -318,7 +322,7 @@ startPPP(Device *devp)
}
else
msgDebug("ppp: Unable to get the terminal attributes!\n");
- execlp("ppp", "ppp", (char *)NULL);
+ execlp("ppp", "ppp", "install", (char *)NULL);
msgDebug("PPP process failed to exec!\n");
exit(1);
}