diff options
| author |   Roy Marples <uberlord@gentoo.org> | 2005-08-01 05:57:22 +0000 |
|---|---|---|
| committer | Roy Marples <uberlord@gentoo.org> | 2005-08-01 05:57:22 +0000 |
| commit | 4032d0dd4c91e7ed9f5735cbab18fa99fdcb171c (patch) | |
| tree | 4ea4f577421a5507c79f0b9d307652dc56b82212 /sys-apps/baselayout | |
| parent | ppc stable (diff) | |
| download | historical-4032d0dd4c91e7ed9f5735cbab18fa99fdcb171c.tar.gz historical-4032d0dd4c91e7ed9f5735cbab18fa99fdcb171c.tar.bz2 historical-4032d0dd4c91e7ed9f5735cbab18fa99fdcb171c.zip | |
Fixed dhclient pre3 patch so it also disbales editing dhclient.conf by default
Package-Manager: portage-2.0.51.22-r2
Diffstat (limited to 'sys-apps/baselayout')
| -rw-r--r-- | sys-apps/baselayout/Manifest | 2 | ||||
| -rw-r--r-- | sys-apps/baselayout/files/baselayout-1.12.0_pre3-dhclient.patch | 15 |
2 files changed, 13 insertions, 4 deletions
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index db1e8cee26d6..73ee83a62e43 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -36,7 +36,7 @@ MD5 67882892030fed7383fe01d89f9539bd files/baselayout-1.11.12-runscript-boot.pat MD5 7b2f5e48c4d9056df539620299c20641 files/rc-scripts-1.4.16-splash.patch 11251 MD5 d50ca91cbb58c7528a60ddf5bb172956 files/sysvinit-2.84-selinux.patch 3206 MD5 50816019be7cc03120fa58d075eb07f7 files/sysvinit-2.84-selinux1.patch 3612 -MD5 bc7f131347a5833b137ceee910a2aaa7 files/baselayout-1.12.0_pre3-dhclient.patch 724 +MD5 000da8c75f9d92743df0add40d4c7f15 files/baselayout-1.12.0_pre3-dhclient.patch 1002 MD5 f69a22a2120638279fe6d5aa9aa8a835 files/digest-baselayout-1.12.0_pre3 75 MD5 df9f21385df40467a0bff0b3d1e5285f files/baselayout-1.11.10-selinux-udev.patch 413 MD5 d69d18485e6cfc948d9f39b2b766a406 files/digest-baselayout-1.9.4-r6 134 diff --git a/sys-apps/baselayout/files/baselayout-1.12.0_pre3-dhclient.patch b/sys-apps/baselayout/files/baselayout-1.12.0_pre3-dhclient.patch index 273915a64b3a..e893962a0a62 100644 --- a/sys-apps/baselayout/files/baselayout-1.12.0_pre3-dhclient.patch +++ b/sys-apps/baselayout/files/baselayout-1.12.0_pre3-dhclient.patch @@ -1,6 +1,15 @@ ---- lib/rcscripts/net.modules.d/dhclient 2005-07-29 19:48:12.000000000 +0200 -+++ lib/rcscripts/net.modules.d/dhclient 2005-07-29 19:47:50.000000000 +0200 -@@ -149,11 +149,10 @@ dhclient_start() { +--- lib/rcscripts/net.modules.d/dhclient (revision 1354) ++++ lib/rcscripts/net.modules.d/dhclient (working copy) +@@ -107,7 +107,7 @@ + interface_exists "${iface}" true || return 1 + + eval edit=\"\$\{dhclient_edit_config_${ifvar}\}\" +- [[ -z ${edit} ]] && eval edit="${dhclient_edit_config:-yes}" ++ [[ -z ${edit} ]] && eval edit="${dhclient_edit_config:-no}" + if [[ ${edit} == "yes" || ${edit} == "true" ]]; then + edit=true + else +@@ -149,11 +149,10 @@ # Send our hostname by editing cffile if ${edit} && [[ -e ${cffile} && ${d} != *" nosendhost "* ]] ; then local hostname=$( hostname ) |