--- linux-2.6-mm/scripts/kconfig/confdata.c.2.6.14-mm2 2005-11-15 00:41:29.647399464 +0100
+++ linux-2.6-mm/scripts/kconfig/confdata.c 2005-11-15 00:45:21.291184256 +0100
@@ -518,23 +518,13 @@ int conf_write(const char *name)
if (!name)
name = conf_def_filename;
sprintf(tmpname, "%s.old", name);
-// printf("rename1(%s, %s)\n", name, tmpname);
-// rename(name, tmpname);
+ rename(name, tmpname);
}
sprintf(tmpname, "%s%s", dirname, basename);
-// printf("rename2(%s, %s)\n", newname, tmpname);
-#if 0
if (rename(newname, tmpname))
return 1;
-#else
- {
- char buf[256];
- sprintf(buf, "cp %s %s", newname, tmpname);
- system(buf);
- unlink(newname);
- }
-#endif
- sym_change_count = 0;
-
+
+ sym_change_count = 0;
+
return 0;
}
Christian Kujau <[email protected]> wrote:
>
>
> hi,
>
> i noticed that 2.6.14-mm2 does not generate a .config.old anymore, so that
> i can undo changes. i see that the Kconfig system is probably in flux
> again ("Why did oldconfig's behavior change in 2.6.15-rc1?"), but i have
> not seen this issue being reported:
Yeah, sorry, the diff you noticed is a horrid seven-second-hack I've
carried in my tree since the new Kconfig stuff went in (2.5.early) because
I want my .config to be a symlink to a revision-controlled file and the
Kconfig system (brokely) insists on blowing away the symlink each time you
run it.
A proper patch (which maybe does an lstat+special-stuff) would be nice.
But that particular diff only appears in the -mm rollup when I'm carrying
other patches against confdata.c, which rarely happens. So it'll go away
again.
Andrew Morton schrieb:
>
> A proper patch (which maybe does an lstat+special-stuff) would be nice.
hm, sorry, but i don't think i can help out here.
> But that particular diff only appears in the -mm rollup when I'm carrying
> other patches against confdata.c, which rarely happens. So it'll go away
> again.
thank you.
Christian.
--
BOFH excuse #74:
You're out of memory