Dr. Werner Fink 2011-04-19 13:52:13 +00:00 committed by Git OBS Bridge
parent 2fcfe93545
commit 21e3e4d8dc
2 changed files with 36 additions and 4 deletions

View File

@ -1,6 +1,14 @@
--- makeboot.c --- makeboot.c
+++ makeboot.c 2010-10-12 16:42:54.000000000 +0000 +++ makeboot.c 2011-04-19 13:45:33.532428242 +0000
@@ -407,6 +407,7 @@ void check_run_files(const char *action, @@ -320,6 +320,7 @@ static void filter_files(const char *dir
t = lookup_target(dirlist[i]->d_name + 3);
if (t) {
t->status = 1;
+ t->filter_prefix = filter_prefix;
if (asprintf(&t->arg0, "%s/%s", path, dirlist[i]->d_name) < 0)
t->arg0 = (char*)0;
}
@@ -407,6 +408,7 @@ void check_run_files(const char *action,
*/ */
#ifndef USE_BLOGD #ifndef USE_BLOGD
# define bootlog(arg...) # define bootlog(arg...)
@ -8,8 +16,27 @@
#endif #endif
/* /*
@@ -437,7 +439,7 @@ struct makenode *pickup_task(void)
close(fd);
}
#endif
- bootlog(B_NOTICE, "service %s %s", best->name, (filter_prefix == 'K') ? "stop" : "start");
+ bootlog(B_NOTICE, "service %s %s", best->name, (best->filter_prefix == 'K') ? "stop" : "start");
best->status = T_RUNNING;
}
return best;
--- makeboot.h
+++ makeboot.h 2011-04-19 13:45:22.304426128 +0000
@@ -35,6 +35,7 @@ struct makenode {
struct makenode *next;
int interactive;
int importance;
+ int filter_prefix;
};
/* dependency and selection list nodes */
--- proc.c --- proc.c
+++ proc.c 2011-03-11 16:00:04.491925980 +0000 +++ proc.c 2011-03-11 16:00:04.000000000 +0000
@@ -94,3 +94,74 @@ int read_proc(unsigned long int * const @@ -94,3 +94,74 @@ int read_proc(unsigned long int * const
return 0; return 0;
} }
@ -94,7 +121,7 @@
-extern void unraw_consoles(void); -extern void unraw_consoles(void);
-extern void raw_consoles(void); -extern void raw_consoles(void);
--- startpar.c --- startpar.c
+++ startpar.c 2011-03-11 15:59:16.388425553 +0000 +++ startpar.c 2011-03-11 15:59:16.000000000 +0000
@@ -52,6 +52,12 @@ @@ -52,6 +52,12 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>

View File

@ -1,3 +1,8 @@
------------------------------------------------------------------
Tue Apr 19 15:51:23 CEST 2011 - werner@suse.de
- Correct shutdown messages of startpar send via blogd
------------------------------------------------------------------ ------------------------------------------------------------------
Tue Apr 19 14:08:04 CEST 2011 - werner@suse.de Tue Apr 19 14:08:04 CEST 2011 - werner@suse.de