From c1c983a56158c2fb32bbfd13762a562b787cf8b0 Mon Sep 17 00:00:00 2001 From: Mike Khiretskiy Date: Mon, 19 Jan 2015 14:33:35 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA?= =?UTF-8?q?=D0=B0=20dhclient=20=D0=B4=D0=BB=D1=8F=20=D0=BF=D0=B5=D1=80?= =?UTF-8?q?=D0=B5=D0=B4=D0=B0=D1=87=D0=B8=20dhcp=20=D1=81=D0=B5=D1=80?= =?UTF-8?q?=D0=B2=D0=B5=D1=80=D1=83=20host-name?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../3.1/2_ac_install_merge/net-misc/dhcp/.calculate_directory | 1 + .../3.1/2_ac_install_merge/net-misc/dhcp/dhclient.conf | 3 +++ profiles/templates/3.2/6_ac_update_sync/remerge/00-ini | 2 +- profiles/templates/3.2/6_ac_update_sync/remerge/30 | 4 ++++ .../3.3/2_ac_install_merge/net-misc/dhcp/.calculate_directory | 1 + .../3.3/2_ac_install_merge/net-misc/dhcp/dhclient.conf | 3 +++ profiles/templates/3.3/6_ac_update_sync/remerge/00-ini | 2 +- profiles/templates/3.3/6_ac_update_sync/remerge/30 | 2 +- profiles/templates/3.3/6_ac_update_sync/remerge/31 | 4 ++++ 9 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 profiles/templates/3.1/2_ac_install_merge/net-misc/dhcp/.calculate_directory create mode 100644 profiles/templates/3.1/2_ac_install_merge/net-misc/dhcp/dhclient.conf create mode 100644 profiles/templates/3.2/6_ac_update_sync/remerge/30 create mode 100644 profiles/templates/3.3/2_ac_install_merge/net-misc/dhcp/.calculate_directory create mode 100644 profiles/templates/3.3/2_ac_install_merge/net-misc/dhcp/dhclient.conf create mode 100644 profiles/templates/3.3/6_ac_update_sync/remerge/31 diff --git a/profiles/templates/3.1/2_ac_install_merge/net-misc/dhcp/.calculate_directory b/profiles/templates/3.1/2_ac_install_merge/net-misc/dhcp/.calculate_directory new file mode 100644 index 000000000..15fd4eef4 --- /dev/null +++ b/profiles/templates/3.1/2_ac_install_merge/net-misc/dhcp/.calculate_directory @@ -0,0 +1 @@ +# Calculate path=/etc merge()!=&&pkg()!= diff --git a/profiles/templates/3.1/2_ac_install_merge/net-misc/dhcp/dhclient.conf b/profiles/templates/3.1/2_ac_install_merge/net-misc/dhcp/dhclient.conf new file mode 100644 index 000000000..592de2609 --- /dev/null +++ b/profiles/templates/3.1/2_ac_install_merge/net-misc/dhcp/dhclient.conf @@ -0,0 +1,3 @@ +# Calculate format=dhcp + +send host-name = pick-first-value(gethostname(), "ISC-dhclient"); diff --git a/profiles/templates/3.2/6_ac_update_sync/remerge/00-ini b/profiles/templates/3.2/6_ac_update_sync/remerge/00-ini index 5fe076e04..876e00bae 100644 --- a/profiles/templates/3.2/6_ac_update_sync/remerge/00-ini +++ b/profiles/templates/3.2/6_ac_update_sync/remerge/00-ini @@ -2,4 +2,4 @@ [overlay-calculate] # Save the latest version, because when switching profile cl-setup-profile 3.2.2 makes a call cl-setup-system -remerge = 29 +remerge = 30 diff --git a/profiles/templates/3.2/6_ac_update_sync/remerge/30 b/profiles/templates/3.2/6_ac_update_sync/remerge/30 new file mode 100644 index 000000000..f68c6cb75 --- /dev/null +++ b/profiles/templates/3.2/6_ac_update_sync/remerge/30 @@ -0,0 +1,4 @@ +# Calculate format=samba path=/etc/calculate name=ini.env merge=net-misc/dhcp ini(overlay-calculate.remerge)<30 + +[overlay-calculate] +remerge = 30 diff --git a/profiles/templates/3.3/2_ac_install_merge/net-misc/dhcp/.calculate_directory b/profiles/templates/3.3/2_ac_install_merge/net-misc/dhcp/.calculate_directory new file mode 100644 index 000000000..15fd4eef4 --- /dev/null +++ b/profiles/templates/3.3/2_ac_install_merge/net-misc/dhcp/.calculate_directory @@ -0,0 +1 @@ +# Calculate path=/etc merge()!=&&pkg()!= diff --git a/profiles/templates/3.3/2_ac_install_merge/net-misc/dhcp/dhclient.conf b/profiles/templates/3.3/2_ac_install_merge/net-misc/dhcp/dhclient.conf new file mode 100644 index 000000000..592de2609 --- /dev/null +++ b/profiles/templates/3.3/2_ac_install_merge/net-misc/dhcp/dhclient.conf @@ -0,0 +1,3 @@ +# Calculate format=dhcp + +send host-name = pick-first-value(gethostname(), "ISC-dhclient"); diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/00-ini b/profiles/templates/3.3/6_ac_update_sync/remerge/00-ini index 876e00bae..8a69572d8 100644 --- a/profiles/templates/3.3/6_ac_update_sync/remerge/00-ini +++ b/profiles/templates/3.3/6_ac_update_sync/remerge/00-ini @@ -2,4 +2,4 @@ [overlay-calculate] # Save the latest version, because when switching profile cl-setup-profile 3.2.2 makes a call cl-setup-system -remerge = 30 +remerge = 31 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/30 b/profiles/templates/3.3/6_ac_update_sync/remerge/30 index 9dfaa3c25..f68c6cb75 100644 --- a/profiles/templates/3.3/6_ac_update_sync/remerge/30 +++ b/profiles/templates/3.3/6_ac_update_sync/remerge/30 @@ -1,4 +1,4 @@ -# Calculate format=samba path=/etc/calculate name=ini.env merge=sys-process/htop,x11-terms/xterm ini(overlay-calculate.remerge)<30 +# Calculate format=samba path=/etc/calculate name=ini.env merge=net-misc/dhcp ini(overlay-calculate.remerge)<30 [overlay-calculate] remerge = 30 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/31 b/profiles/templates/3.3/6_ac_update_sync/remerge/31 new file mode 100644 index 000000000..08116aa21 --- /dev/null +++ b/profiles/templates/3.3/6_ac_update_sync/remerge/31 @@ -0,0 +1,4 @@ +# Calculate format=samba path=/etc/calculate name=ini.env merge=sys-process/htop,x11-terms/xterm ini(overlay-calculate.remerge)<31 + +[overlay-calculate] +remerge = 31