[Balloon-svn] r1849 - in balloon/branches/1.0-stable/rootfs/…

Author: cmjones
Date: 2012-03-13 17:32:21 +0000 (Tue, 13 Mar 2012)
New Revision: 1849

Added:
balloon/branches/1.0-stable/rootfs/debian/balloon3-config-podpoint/files/dhclient.conf.balloon3
Removed:
balloon/branches/1.0-stable/rootfs/debian/balloon3-config-podpoint/files/dhclient.conf
Modified:
balloon/branches/1.0-stable/rootfs/debian/balloon3-config-podpoint/debian/install
Log:
Changed podpoint balloon3-config package so it provides
dhclient.conf.balloon3 instead of dhclient.conf which clashes with
dhcp3 package

Modified: balloon/branches/1.0-stable/rootfs/debian/balloon3-config-podpoint/debian/install
===================================================================
--- balloon/branches/1.0-stable/rootfs/debian/balloon3-config-podpoint/debian/install    2012-03-09 20:44:03 UTC (rev 1848)
+++ balloon/branches/1.0-stable/rootfs/debian/balloon3-config-podpoint/debian/install    2012-03-13 17:32:21 UTC (rev 1849)
@@ -6,7 +6,7 @@
 files/mountall.sh /etc/init.d
 files/inittab /etc
 files/urandom /etc/init.d
-files/dhclient.conf /etc/dhcp3
+files/dhclient.conf.balloon3 /etc/dhcp3
 files/firmware/libertas_cs.fw /lib/firmware
 files/firmware/libertas_cs_helper.fw /lib/firmware

Deleted: balloon/branches/1.0-stable/rootfs/debian/balloon3-config-podpoint/files/dhclient.conf
===================================================================
--- balloon/branches/1.0-stable/rootfs/debian/balloon3-config-podpoint/files/dhclient.conf    2012-03-09 20:44:03 UTC (rev 1848)
+++ balloon/branches/1.0-stable/rootfs/debian/balloon3-config-podpoint/files/dhclient.conf    2012-03-13 17:32:21 UTC (rev 1849)
@@ -1,58 +0,0 @@
-# Configuration file for /sbin/dhclient, which is included in Debian's
-#    dhcp3-client package.
-#
-# This is a sample configuration file for dhclient. See dhclient.conf's
-#    man page for more information about the syntax of this file
-#    and a more comprehensive list of the parameters understood by
-#    dhclient.
-#
-# Normally, if the DHCP server provides reasonable information and does
-#    not leave anything out (like the domain name, for example), then
-#    few changes must be made to this file, if any.
-#
-
-#balloon config
-send host-name "podpoint";
-#don't wait a whole 2 minutes if no response
-timeout 10;
-initial-interval 2;
-
-#send host-name "andare.fugue.com";
-#send dhcp-client-identifier 1:0:a0:24:ab:fb:9c;
-#send dhcp-lease-time 3600;
-#supersede domain-name "fugue.com home.vix.com";
-
-#prepend domain-name-servers 127.0.0.1;
-request subnet-mask, broadcast-address, time-offset, routers,
-    domain-name, domain-name-servers, host-name,
-    netbios-name-servers, netbios-scope, interface-mtu;
-#require subnet-mask, domain-name-servers;
-#timeout 60;
-#retry 60;
-#reboot 10;
-#select-timeout 5;
-#initial-interval 2;
-#script "/etc/dhcp3/dhclient-script";
-#media "-link0 -link1 -link2", "link0 link1";
-#reject 192.33.137.209;
-
-#alias {
-#  interface "eth0";
-#  fixed-address 192.5.5.213;
-#  option subnet-mask 255.255.255.255;
-#}
-
-#lease {
-#  interface "eth0";
-##  filename "static-ip-config";
-#  fixed-address 192.168.1.222;
-##  medium "link0 link1";
-#  option host-name "balloon";
-#  option subnet-mask 255.255.255.0;
-##  option broadcast-address 192.33.137.255;
-#  option routers 192.168.1.1;
-##  option domain-name-servers 192.168.1.1;
-#  renew 2 2020/1/12 00:00:01;
-#  rebind 2 2020/1/12 00:00:01;
-#  expire 2 2020/1/12 00:00:01;
-#}
\ No newline at end of file

Copied: balloon/branches/1.0-stable/rootfs/debian/balloon3-config-podpoint/files/dhclient.conf.balloon3 (from rev 1848, balloon/branches/1.0-stable/rootfs/debian/balloon3-config-podpoint/files/dhclient.conf)
===================================================================
--- balloon/branches/1.0-stable/rootfs/debian/balloon3-config-podpoint/files/dhclient.conf.balloon3                            (rev 0)
+++ balloon/branches/1.0-stable/rootfs/debian/balloon3-config-podpoint/files/dhclient.conf.balloon3    2012-03-13 17:32:21 UTC (rev 1849)
@@ -0,0 +1,58 @@
+# Configuration file for /sbin/dhclient, which is included in Debian's
+#    dhcp3-client package.
+#
+# This is a sample configuration file for dhclient. See dhclient.conf's
+#    man page for more information about the syntax of this file
+#    and a more comprehensive list of the parameters understood by
+#    dhclient.
+#
+# Normally, if the DHCP server provides reasonable information and does
+#    not leave anything out (like the domain name, for example), then
+#    few changes must be made to this file, if any.
+#
+
+#balloon config
+send host-name "podpoint";
+#don't wait a whole 2 minutes if no response
+timeout 10;
+initial-interval 2;
+
+#send host-name "andare.fugue.com";
+#send dhcp-client-identifier 1:0:a0:24:ab:fb:9c;
+#send dhcp-lease-time 3600;
+#supersede domain-name "fugue.com home.vix.com";
+
+#prepend domain-name-servers 127.0.0.1;
+request subnet-mask, broadcast-address, time-offset, routers,
+    domain-name, domain-name-servers, host-name,
+    netbios-name-servers, netbios-scope, interface-mtu;
+#require subnet-mask, domain-name-servers;
+#timeout 60;
+#retry 60;
+#reboot 10;
+#select-timeout 5;
+#initial-interval 2;
+#script "/etc/dhcp3/dhclient-script";
+#media "-link0 -link1 -link2", "link0 link1";
+#reject 192.33.137.209;
+
+#alias {
+#  interface "eth0";
+#  fixed-address 192.5.5.213;
+#  option subnet-mask 255.255.255.255;
+#}
+
+#lease {
+#  interface "eth0";
+##  filename "static-ip-config";
+#  fixed-address 192.168.1.222;
+##  medium "link0 link1";
+#  option host-name "balloon";
+#  option subnet-mask 255.255.255.0;
+##  option broadcast-address 192.33.137.255;
+#  option routers 192.168.1.1;
+##  option domain-name-servers 192.168.1.1;
+#  renew 2 2020/1/12 00:00:01;
+#  rebind 2 2020/1/12 00:00:01;
+#  expire 2 2020/1/12 00:00:01;
+#}
\ No newline at end of file