[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Mandrakelinux again
From: |
Chip Seraphine |
Subject: |
Re: Mandrakelinux again |
Date: |
Tue, 19 Apr 2005 11:00:29 -0500 |
User-agent: |
Mozilla Thunderbird 1.0 (X11/20041208) |
Doh!! Just noticed the command line was reversed, which will annoy
autopatchers. Trying again with the arguments in the right order:
$ diff -u misc.c.orig misc.c
--- misc.c.orig 2005-04-19 09:55:53.400774000 -0500
+++ misc.c 2005-04-19 10:01:26.282910000 -0500
@@ -1262,6 +1262,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"
@@ -1302,6 +1303,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);
Chip Seraphine wrote:
Appears that when the patch was un-removed part of it became missing.
The following patch to 2.1.14 will restore Mandrake 10.1 flavored
distro detection.
$ diff -u misc.c misc.c.orig
--- misc.c 2005-04-19 10:01:26.282910000 -0500
+++ misc.c.orig 2005-04-19 09:55:53.400774000 -0500
@@ -1262,7 +1262,6 @@
/* 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"
@@ -1303,10 +1302,6 @@
{
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);
--
Chip Seraphine
Unix Administrator
TradeLink, LLC
312-264-2048
address@hidden