On Wed, Feb 22, 2006 at 02:45:55PM +0100, Geert Stappers wrote:
> On Tue, Feb 21, 2006 at 05:02:37PM -0500, Joey Hess wrote:
> > So, here's how it's currently implemented instead:
> >
> > if substring (option vendor-class-identifier, 0, 3) = "d-i" {
> > filename "http://dragon/~joey/preseed.cfg";;
> > }
>
>
> The emitted string is "NetcfgDHClient" ( don't "d-i" )
Oops, I missed:
Index: debian/changelog
===================================================================
--- debian/changelog (revision 35029)
+++ debian/changelog (revision 35030)
@@ -9,8 +9,12 @@
[ Christian Perrier ]
* Temporarily unmark debian-installer/netcfg-st/title as untranslatable
- -- Christian Perrier <bubulle@debian.org> Sun, 5 Feb 2006 12:10:11 +0100
+ [ Joey Hess ]
+ * Change class identifier of the dhcp client from "NetcfgDHClient" to just
+ "d-i", which is a bit easier to remeber and type.
+ -- Joey Hess <joeyh@debian.org> Tue, 21 Feb 2006 15:59:33 -0500
+
netcfg (1.23) unstable; urgency=low
* Don't propagate NetcfgDHClient class identifier to installed system.
Index: dhcp.c
===================================================================
--- dhcp.c (revision 35029)
+++ dhcp.c (revision 35030)
@@ -148,7 +148,7 @@
if ((dc = file_open(DHCLIENT_CONF, "w")))
{
- fprintf(dc, "send dhcp-class-identifier \"NetcfgDHClient\";\n" );
+ fprintf(dc, "send dhcp-class-identifier \"d-i\";\n" );
if (dhostname)
{
fprintf(dc, "send host-name \"%s\";\n", dhostname);
@@ -164,7 +164,7 @@
if ((dc = file_open(DHCLIENT3_CONF, "w")))
{
- fprintf(dc, "send vendor-class-identifier \"NetcfgDHClient\";\n" );
+ fprintf(dc, "send vendor-class-identifier \"d-i\";\n" );
if (dhostname)
{
fprintf(dc, "send host-name \"%s\";\n", dhostname);
Index: base-installer
===================================================================
--- base-installer (revision 35029)
+++ base-installer (revision 35030)
@@ -11,7 +11,7 @@
for file in /etc/dhclient.conf /etc/dhcp3/dhclient.conf; do
if [ -f "$file" ]; then
mkdir /target/$(dirname $file) -p
- sed '/^send \(dhcp\|vendor\)-class-identifier "NetcfgDHClient";$/d' \
+ sed '/^send \(dhcp\|vendor\)-class-identifier "d-i";$/d' \
< $file > /target/$file
[ -s "/target/$file" ] || rm -f /target/$file
fi
>
> ISC DHCP Server configuration file /etc/dhcp3/dhcpd.conf
> should contain
>
> if substring (option vendor-class-identifier, 0, 14) = "NetcfgDHClient" {
> filename "proto://host.tld/path/to/preseed.cfg"; }
> else { filename "network/boot/image"; }
Having 'if-then-else' in the dhcpd.conf is needed for booting from network.
Again
> The emitted string is "NetcfgDHClient" ( don't "d-i" )
in current netcfg-udeb.
With which string go _we_ into production a.k.a. next release
and with which string go the deveriate distributions into production???
How vendor neutral is "d-i" as identification string?
NetcfgDHClient _is_ vendor neutral. The kapitals come from Netcfg (name
of the Network configuration program; DHCP, Dynamic Host Configuration
Protocol and Dhclient, the program doing the actual DHCP transmissions.
NetcfgDHClient is most of all UNIQUE !
NetcfgDHClient or d-i (or somethingelse) ????????????
Geert Stappers
Hoping it gets decided before the release of Beta2.
Attachment:
signature.asc
Description: Digital signature