forked from dan/liminix
Revert "wwan gets address from ppp ipcp not dhcp"
This reverts commit be13ab23ca
.
This commit is contained in:
parent
eae99051fa
commit
adc84108ad
|
@ -36,18 +36,22 @@ in rec {
|
|||
username = "user";
|
||||
password = "one2one";
|
||||
authType = "chap";
|
||||
};
|
||||
|
||||
services.dhcpc = svc.network.dhcp.client.build {
|
||||
interface = config.services.wwan;
|
||||
dependencies = [ config.services.hostname ];
|
||||
};
|
||||
|
||||
services.sshd = svc.ssh.build { };
|
||||
|
||||
services.resolvconf = oneshot rec {
|
||||
dependencies = [ services.wwan ];
|
||||
dependencies = [ services.dhcpc ];
|
||||
name = "resolvconf";
|
||||
up = ''
|
||||
. ${serviceFns}
|
||||
( in_outputs ${name}
|
||||
for i in $(output ${services.wwan} dns); do
|
||||
for i in $(output ${services.dhcpc} dns); do
|
||||
echo "nameserver $i" > resolv.conf
|
||||
done
|
||||
)
|
||||
|
|
|
@ -53,7 +53,6 @@ let
|
|||
};
|
||||
symlink = "/dev/modem";
|
||||
});
|
||||
# XXX need an ip-up script here to collect the IP address
|
||||
up = ''
|
||||
ls -l /dev/modem
|
||||
test -L /dev/modem || exit 1
|
||||
|
|
Loading…
Reference in New Issue