summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <uberlord@gentoo.org>2006-03-22 21:22:51 +0000
committerRoy Marples <uberlord@gentoo.org>2006-03-22 21:22:51 +0000
commit58da39cf3c323c60805a309da876682fe40af5a6 (patch)
treead0161972815e378af0d5e1e0ef6ce6de11b6fea /net-misc
parentdev-lang/spidermonkey stable on ppc. (diff)
downloadgentoo-2-58da39cf3c323c60805a309da876682fe40af5a6.tar.gz
gentoo-2-58da39cf3c323c60805a309da876682fe40af5a6.tar.bz2
gentoo-2-58da39cf3c323c60805a309da876682fe40af5a6.zip
Fix hostname being set properly for Linux
(Portage version: 2.1_pre6-r5)
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/dhcp/Manifest22
-rw-r--r--net-misc/dhcp/files/dhcp-3.0.3-dhclient-hostname.patch13
-rw-r--r--net-misc/dhcp/files/dhcp-3.0.3-dhclient-mtu.patch4
3 files changed, 16 insertions, 23 deletions
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index fb4deb93781d..97d223c092fc 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
MD5 ac78d50c0f394388e4c68d5437e00927 ChangeLog 15510
RMD160 da8ff82dff0b28a250c5d7b1aed27a03088eda36 ChangeLog 15510
SHA256 b5b882134ef7b58dd444a40db22187147ec58bd6abd879a3e07b6775ad2b389c ChangeLog 15510
@@ -22,15 +19,15 @@ SHA256 a8db9eb98397a9c1b3a0de07fc107c39dc4f6a4a331d404fc6fcc4a8dbc7aeae files/dh
MD5 d0f61288e81ce020573f3f6965af8489 files/dhcp-3.0.2-gmake.patch 1872
RMD160 d2d41c0a7e002103d68605d2492bfe716bb2889e files/dhcp-3.0.2-gmake.patch 1872
SHA256 b2bbfc1d1f5b4d03ff3f53b3974ec32731e5f626de8f8d127328591e4c721215 files/dhcp-3.0.2-gmake.patch 1872
-MD5 dbd178c799c96e5b9720f09079cf74f9 files/dhcp-3.0.3-dhclient-hostname.patch 390
-RMD160 426f6e8f1bab18f1c870c50acaed2efe2cb9330e files/dhcp-3.0.3-dhclient-hostname.patch 390
-SHA256 fd7f234ffe55a0a701a490e5632e64c5b0091ad83a7b64178d0da0039d3ed914 files/dhcp-3.0.3-dhclient-hostname.patch 390
+MD5 3be3d51148b295a0ab4ccd474777e776 files/dhcp-3.0.3-dhclient-hostname.patch 437
+RMD160 c87eef3dc303ec71222f524bbf7ed26f26cfaba1 files/dhcp-3.0.3-dhclient-hostname.patch 437
+SHA256 bbad970318815a1c9d92542b71f29ba4b873866cc37ac1560926108355cf92e7 files/dhcp-3.0.3-dhclient-hostname.patch 437
MD5 ce6d16f53a6f0308c57e12f541450170 files/dhcp-3.0.3-dhclient-metric.patch 6568
RMD160 15ab7cfb108aabb2c170e9cb796ed310675bf198 files/dhcp-3.0.3-dhclient-metric.patch 6568
SHA256 1a2887e6f644bb3e9ab5bf35631f0ebb71300fe66405db5454c0a193aa20299b files/dhcp-3.0.3-dhclient-metric.patch 6568
-MD5 ff7ec994964b5a0b8f0c03b86eedbe22 files/dhcp-3.0.3-dhclient-mtu.patch 6471
-RMD160 7ff0e447976f652e765de10ec74012b19cb35961 files/dhcp-3.0.3-dhclient-mtu.patch 6471
-SHA256 44bd303721baa85f582530689b10d6615a467bf5e992cc48bc9c33aa7d962415 files/dhcp-3.0.3-dhclient-mtu.patch 6471
+MD5 962250f2eed048d031df04c93e851fed files/dhcp-3.0.3-dhclient-mtu.patch 6471
+RMD160 271f437a115301258352d64c82bdb4ee2b612c8a files/dhcp-3.0.3-dhclient-mtu.patch 6471
+SHA256 772baa7ed412396d817a283d2150cc96b9a613db94fee5a866508a57d99c379a files/dhcp-3.0.3-dhclient-mtu.patch 6471
MD5 3eab8a40f0a84d3b2d9d406fa4b687c0 files/dhcp-3.0.3-dhclient-ntp.patch 5868
RMD160 41522438308fc8b82dc298752192d1c77b4c26aa files/dhcp-3.0.3-dhclient-ntp.patch 5868
SHA256 751fdfa0b36eab386f4029284d61c0c2b41b3135878738caa02e512999f2ca65 files/dhcp-3.0.3-dhclient-ntp.patch 5868
@@ -82,10 +79,3 @@ SHA256 8cf36e2e9d5c1d147a8635fd156ba84d5ce0d4bad70f85e73b9aafee89c71382 files/di
MD5 436163172942ee1a0bcfb47534a71cce metadata.xml 330
RMD160 216100112bb6a0ffcd8f7779fb876e4a726913fe metadata.xml 330
SHA256 456ab9c26235fa4c1eda6b53b163e901869d5f64ba442b30db1fe86c57fe56af metadata.xml 330
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEIY5IEbVyYKaZ/NERAniMAKCD38J7kp8Djjx4JRsV75DQmy00lQCgi7UA
-A8hNXqp3ctuZv+74bJRuzZk=
-=YSD6
------END PGP SIGNATURE-----
diff --git a/net-misc/dhcp/files/dhcp-3.0.3-dhclient-hostname.patch b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-hostname.patch
index a44f542bf308..d382c628f548 100644
--- a/net-misc/dhcp/files/dhcp-3.0.3-dhclient-hostname.patch
+++ b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-hostname.patch
@@ -1,10 +1,13 @@
---- client/scripts/linux
-+++ client/scripts/linux
-@@ -141,6 +141,7 @@
+--- client/scripts/linux
++++ client/scripts/linux
+@@ -141,9 +141,8 @@
[ x$reason = xREBIND ] || [ x$reason = xREBOOT ]; then
current_hostname=`hostname`
if [ x$current_hostname = x ] || \
+ [ x$current_hostname = "x(none)" ] || \
[ x$current_hostname = x$old_host_name ]; then
- if [ x$current_hostname = x ] || \
- [ x$new_host_name != x$old_host_name ]; then
+- if [ x$current_hostname = x ] || \
+- [ x$new_host_name != x$old_host_name ]; then
+ hostname $new_host_name
+ fi
+ fi
diff --git a/net-misc/dhcp/files/dhcp-3.0.3-dhclient-mtu.patch b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-mtu.patch
index 576027ad5a09..534f03524904 100644
--- a/net-misc/dhcp/files/dhcp-3.0.3-dhclient-mtu.patch
+++ b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-mtu.patch
@@ -70,7 +70,7 @@
if [ x$IF_METRIC != x ]; then
metric_arg="metric $IF_METRIC"
fi
-@@ -162,7 +165,7 @@
+@@ -160,7 +163,7 @@
[ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
ifconfig $interface inet $new_ip_address $new_subnet_arg \
@@ -79,7 +79,7 @@
# Add a network route to the computed network address.
if [ $relmajor -lt 2 ] || \
( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] ); then
-@@ -204,7 +207,7 @@
+@@ -202,7 +205,7 @@
ifconfig $interface:0- inet 0
fi
ifconfig $interface inet $new_ip_address $new_subnet_arg \