Author: glen Date: Sun Feb 26 12:07:46 2006 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated to 0.5.4
---- Files affected: SOURCES: initng-savefile.patch (1.5 -> 1.6) , initng-utmpx.patch (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SOURCES/initng-savefile.patch diff -u SOURCES/initng-savefile.patch:1.5 SOURCES/initng-savefile.patch:1.6 --- SOURCES/initng-savefile.patch:1.5 Sun Dec 25 01:06:15 2005 +++ SOURCES/initng-savefile.patch Sun Feb 26 13:07:41 2006 @@ -1,13 +1,13 @@ ---- ./plugins/reload/initng_reload.c~ 2005-11-29 22:08:20.000000000 +0200 -+++ ./plugins/reload/initng_reload.c 2005-11-29 22:09:04.000000000 +0200 -@@ -41,8 +41,8 @@ +--- initng-0.5.4/plugins/reload/initng_reload.c~ 2006-02-26 13:44:46.000000000 +0200 ++++ initng-0.5.4/plugins/reload/initng_reload.c 2006-02-26 13:46:05.000000000 +0200 +@@ -42,8 +42,8 @@ #include "initng_reload.h" --#define SAVE_FILE VARDIR "/initng_db_backup.v12" --#define SAVE_FILE_FAKE VARDIR "/initng_db_backup_fake.v12" -+#define SAVE_FILE "/var/run/initng_db_backup.v12" -+#define SAVE_FILE_FAKE "/var/run/initng_db_backup_fake.v12" +-#define SAVE_FILE VARDIR "/initng_db_backup.v13" +-#define SAVE_FILE_FAKE VARDIR "/initng_db_backup_fake.v13" ++#define SAVE_FILE "/var/run/initng_db_backup.v13" ++#define SAVE_FILE_FAKE "/var/run/initng_db_backup_fake.v13" - s_command FAST_RELOAD = { 'c', "hot_reload", VOID_COMMAND, NO_OPT, - {(void *) &cmd_fast_reload}, + static int write_file(const char *filename); + static int read_file(const char *filename); ================================================================ Index: SOURCES/initng-utmpx.patch diff -u SOURCES/initng-utmpx.patch:1.3 SOURCES/initng-utmpx.patch:1.4 --- SOURCES/initng-utmpx.patch:1.3 Fri Jul 29 21:00:53 2005 +++ SOURCES/initng-utmpx.patch Sun Feb 26 13:07:41 2006 @@ -16,7 +16,7 @@ #include "initreq.h" #include "initng_initctl.h" -@@ -191,35 +193,34 @@ +@@ -235,15 +235,14 @@ static void makeutmp(int runlevel) { D_("Making utmp file for runlevel %d\n", runlevel); @@ -28,16 +28,14 @@ * this is created by bootmisc, if this isn't there we can't set runlevel. */ - if (access(UTMP_FILE, F_OK) < 0) -+ /* + if (access(UTMPX_FILE, F_OK) < 0) { - F_("/var/run/utmp does not exist, this should be created by bootmisc.i\n"); + F_("%s not exist, this should be created by bootmisc.i\n", UTMPX_FILE); return; -- } -+ }*/ + } /* - todo, is this a good idea or a bad idea? +@@ -251,19 +250,18 @@ utmpname("/var/run/utmp"); */ @@ -52,11 +50,12 @@ + memset(&utmpx, 0, sizeof(utmpx)); + utmpx.ut_type = RUN_LVL; + utmpx.ut_pid = ('#' << 8) + runlevel + '0'; -+ gettimeofday (&utmpx.ut_tv, NULL); ++ gettimeofday(&utmpx.ut_tv, NULL); + if (pututxline(&utmpx) == NULL) { - F_("pututline failed\n"); +- F_("pututline failed\n"); - endutent(); ++ F_("pututxline failed\n"); + endutxent(); return; } ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/initng-savefile.patch?r1=1.5&r2=1.6&f=u http://cvs.pld-linux.org/SOURCES/initng-utmpx.patch?r1=1.3&r2=1.4&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit