Re: Mandrake 10.1 patch resubmission

[Chip Seraphine]

Unfortunately, the changes broke the patch.

< #define MANDRAKE_10_1_ID "Mandrake Linux 10"

really needs to remain

> #define MANDRAKE_10_1_ID "Mandrakelinux"


MANDRAKE_10_1_ID  is the token being matched in the file provided by 
Mandrake (/etc/mandrake-release).  We don't have the option of making it 
an arbitary string, unfortunately.  Since "Mandrake Linux 10" does not 
appear in /etc/mandrake-release, this causes the function to fail

Could you please revert the change back to the patch as submitted?

Thanks!

Mark.Burgess@iu.hio.no wrote:

> I have made a couple of minor changes so tht this is consistent with
> previous designations.
> M
>
> On 10 Jan, Chip Seraphine wrote:
>  
>
> > This one didn't seem to make it into 2.1.12.  Misc.c didn't change since
> > 2.1.11 so it should still work.  Resubmitting per Mark's request....
> >
> > http://lists.gnu.org/archive/html/help-cfengine/2004-12/msg00054.html
> >
> > --
> >
> > Another Mandrake release, another Mandrake releasestring. Yep, they
> > changed the token *again*, this time from "Mandrake Linux" to
> > "mandrakelinux".
> >
> > The patch below will allow distro detection to work correctly on
> > Mandrake 10.1 systems.
> >
> >
> > --- misc.c.orig 2004-12-09 16:37:56.662562000 -0600
> > +++ misc.c.new  2004-12-09 16:38:01.311362000 -0600
> > @@ -984,6 +984,7 @@
> > * Red Hat Enterprise Linux ES release 2.1 (Panama)
> > * Fedora Core release 1 (Yarrow)
> > * White Box Enterprise linux release 3.0 (Liberation)
> > +
> > */
> >
> >
> > #define RH_REL_FILENAME "/etc/redhat-release"
> > @@ -1246,6 +1247,7 @@
> > /* We are looking for one of the following strings... */
> > #define MANDRAKE_ID "Linux Mandrake"
> > #define MANDRAKE_REV_ID "Mandrake Linux"
> > +#define MANDRAKE_10_1_ID "Mandrakelinux"
> >
> >
> > #define RELEASE_FLAG "release "
> > #define MANDRAKE_REL_FILENAME "/etc/mandrake-release"
> > @@ -1286,6 +1288,10 @@
> > {
> > vendor = "mandrake";
> > }
> > + else if(!strncmp(relstring, MANDRAKE_10_1_ID, strlen(MANDRAKE_10_1_ID)))
> > + {
> > + vendor = "mandrake";
> > + }
> > else
> > {
> > Verbose("Could not identify OS distro from %s\n", MANDRAKE_REL_FILENAME);
> >
> >
> >
> >
> >
> >    
>
>
>
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> Work: +47 22453272            Email:  Mark.Burgess@iu.hio.no
> Fax : +47 22453205            WWW  :  http://www.iu.hio.no/~mark
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>
>
>
> _______________________________________________
> Help-cfengine mailing list
> Help-cfengine@gnu.org
> http://lists.gnu.org/mailman/listinfo/help-cfengine
>  


--

Chip Seraphine
Unix Administrator
TradeLink, LLC
312-264-2048
chip@trdlnk.com