commit 2f23e41ed1cc4d874b65394fc181851ac97efc07
parent 773621efe6fd27d75fe97ebed029622db11cbb4b
Author: leitner <leitner>
Date: Fri, 14 Nov 2003 19:09:29 +0000
add minit-update (Florian Westphal)
Diffstat:
6 files changed, 295 insertions(+), 29 deletions(-)
diff --git a/CHANGES b/CHANGES
@@ -5,6 +5,10 @@
add shutdown
add -Wall and -W and kill resulting compiler warnings
several fixes (Bernd Wachter)
+ add update support - tell minit to execve something else, a newer
+ version of itself, preferably (Florian Westphal)
+ also add minit-update program to download state from old minit and
+ upload state to new minit after update (Florian Westphal)
0.9.1:
fix embarassing typo in msvc (Gelu G. Lupas)
diff --git a/Makefile b/Makefile
@@ -1,4 +1,5 @@
-all: minit msvc pidfilehack hard-reboot write_proc killall5 shutdown
+all: minit msvc pidfilehack hard-reboot write_proc killall5 shutdown \
+minit-update
#CFLAGS=-pipe -march=i386 -fomit-frame-pointer -Os -I../dietlibc/include
DIET=diet
@@ -19,8 +20,7 @@ str_start.o
minit-update: minit-update.o buffer_1.o buffer_2.o buffer_puts.o \
buffer_putsflush.o buffer_put.o buffer_flush.o buffer_stubborn.o \
-buffer_putflush.o byte_copy.o split.o str_len.o openreadclose.o \
-str_len.o
+buffer_putflush.o byte_copy.o split.o str_len.o openreadclose.o
$(DIET) $(CROSS)$(CC) $(LDFLAGS) -o minit-update $^
shutdown: shutdown.o split.o openreadclose.o opendevconsole.o
@@ -51,7 +51,7 @@ killall5: killall5.c
install-files:
install -d $(DESTDIR)/etc/minit $(DESTDIR)/sbin $(DESTDIR)/bin
install minit pidfilehack $(DESTDIR)/sbin
- install write_proc hard-reboot $(DESTDIR)/sbin
+ install write_proc hard-reboot minit-update $(DESTDIR)/sbin
install msvc $(DESTDIR)/bin
install -m 4750 shutdown $(DESTDIR)/sbin
test -f $(DESTDIR)/sbin/init || ln $(DESTDIR)/sbin/minit $(DESTDIR)/sbin/init
diff --git a/TODO b/TODO
@@ -1,8 +1,5 @@
The "sync" support should be done asynchronously, not with waitpid.
-introduce a new exec command to tell minit to execve() a new version of
- it without reboot
-
if hwclock is used to adjust the system clock by a few hours, the minit
times will be completely off. Maybe we should use the poll timeout to
keep track of what we think how long we are running and use that as a
diff --git a/minit-update.c b/minit-update.c
@@ -0,0 +1,254 @@
+#include <errno.h>
+#include <dirent.h>
+#include <fcntl.h>
+#include <sys/file.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include "str.h"
+#include "buffer.h"
+
+#include "minit.h"
+
+#define USAGE "Usage: minit-update [ -v [ -u ] ]\n"
+#define BUFLEN 1500
+
+/*
+ increases file size by almost 4k
+#define WITH_STRERROR */
+
+static char buf[BUFLEN+1];
+
+static unsigned int verbose;
+static int do_update;
+
+int openreadclose(char *fn, char **buf, unsigned long *len);
+char **split(char *buf,int c,int *len,int plus,int ofs);
+
+void feed_struct_to_minit(struct process *data);
+
+ssize_t read_outfd(void *buf, size_t count);
+
+void addprocess(struct process *p);
+
+
+void die(const char *msg) {
+ buffer_putsflush(buffer_2, msg);
+ _exit(111);
+}
+
+
+void buffer_putsnlflush(buffer *b, const char *msg) {
+ buffer_puts(b, msg);
+ buffer_putflush(b, "\n",1);
+}
+
+
+#ifdef WITH_STRERROR
+void buffer_puts_strerror(const char *msg) {
+ buffer_puts(buffer_2, "minit-update: ");
+ buffer_puts(buffer_2, msg);
+ buffer_putsnlflush(buffer_2, strerror(errno));
+}
+#else
+#define buffer_puts_strerror(a) buffer_putsflush(buffer_2, a)
+#endif
+
+
+void *xmalloc(size_t size) {
+ void *ptr=malloc(size);
+ if (!ptr) die("malloc() failed\n");
+ return ptr;
+}
+
+
+void copywrite (const char *service) {
+ strncpy(buf+1,service,BUFLEN);
+ buf[BUFLEN]=0;
+ write(infd,buf,str_len(buf));
+}
+
+
+int read_reply_from_minit(void) {
+ if (read_outfd(buf,BUFLEN)==1) {
+ if (buf[0]=='1') return 1;
+ if (buf[0]=='0') buffer_puts(buffer_2,"expected '1' from minit, got '0' - minit too old?\n");
+ }
+ /* XXX: Uuuh. Should this be checked?
+ else buffer_putsflush(buffer_2, "minit response not understood\n");
+ */
+return 0;
+}
+
+
+void find_service(int subdir, char *name, char *parent) {
+ struct stat statbuf;
+ char *service=0;
+ DIR *dirstream=0;
+ struct dirent *dir;
+
+ if (chdir(name)) return;
+
+ if (parent) {
+ service=xmalloc(str_len(parent) + str_len(name) + 2 );
+ strcpy(service, parent);
+ strcat(service, "/");
+ strcat(service, name);
+ } else {
+ if (subdir) {
+ service=xmalloc(str_len(name)+1);
+ strcpy(service, name);
+ }
+ }
+#if 0
+ buffer_putsnlflush(buffer_1,service);
+#endif
+
+ if (service) { /* request and read a "struct process" from minit */
+ struct process tmp;
+#if 0
+ int j;
+ for (j=0; j<=maxprocess; ++j) { /* skip duplicates */
+ if(!strcmp(root[j].name,service)) return 0;
+ }
+#endif
+
+ if (verbose) {
+ buffer_puts(buffer_1, "minit-update: status for ");
+ buffer_puts(buffer_1, service);
+ }
+
+ buf[0]='D';
+ copywrite(service);
+
+ switch (read_outfd(&tmp,sizeof(tmp))) {
+ case sizeof(tmp):
+ tmp.name=strdup(service);
+ addprocess(&tmp);
+ if (verbose) buffer_puts(buffer_1, " saved.\n");
+ break;
+ case 1:
+ if (verbose) buffer_puts(buffer_1, " failed - minit has no information on this service\n");
+ #if 0
+ break;
+ default:
+ buffer_puts(buffer_1, " failed - read incomplete structure!\n");
+ #endif
+ }
+ }
+
+dirstream=opendir(".");
+if (!dirstream) goto ret;
+
+while ( (dir=readdir(dirstream))){
+ if (dir->d_name[0]!='.') {
+ if(!lstat(dir->d_name, &statbuf)) {
+ if (S_ISDIR(statbuf.st_mode)) {
+ find_service(1, dir->d_name, service);
+#if 0
+ } else {
+ buffer_putsnlflush(buffer_1,dir->d_name);
+#endif
+ }
+ } else {
+ buffer_puts(buffer_2, dir->d_name);
+ buffer_puts(buffer_2, ": cannot stat\n");
+ buffer_puts_strerror("lstat() failed: ");
+ }
+ }
+} /* while */
+
+closedir(dirstream);
+
+ret:
+if (service) free(service);
+chdir(MINITROOT);
+if (parent) chdir(parent);
+buffer_flush(buffer_1);
+}
+
+
+int main(int argc, char **argv) {
+ int i;
+
+ if (argc < 2) die(USAGE);
+
+ while (argc>1) {
+ argc--;
+ if (argv[argc][0]=='-') {
+ switch(argv[argc][1]) {
+ case 'v': verbose++; break;
+ case 'u': do_update=1; break;
+ default:
+ buffer_puts(buffer_2,"minit-update: Unknown Option: ");
+ buffer_putsnlflush(buffer_2,argv[argc]);
+ }
+ } else die(USAGE);
+ }
+
+ infd=open("/etc/minit/in",O_WRONLY);
+ outfd=open("/etc/minit/out",O_RDONLY);
+
+ if (infd<0 || outfd<0) die("could not open /etc/minit/in or /etc/minit/out\n");
+
+ while (lockf(infd,F_TLOCK,1)) {
+ buffer_puts_strerror("could not acquire lock: ");
+ sleep(1);
+ }
+
+ find_service(0,MINITROOT,0);
+
+ if (maxprocess == -1)
+ die("Could not extract running services from minit\n");
+
+ if (verbose) buffer_putsflush(buffer_1, "minit-update: telling minit to execve itself\n");
+
+ if (!do_update) {
+ buffer_putsflush(buffer_2, "Test mode: No update done.\n");
+ return 0;
+ }
+
+ write(infd,"update",6);
+
+ for (i=0; i<=maxprocess; i++) {
+ if (verbose) {
+ buffer_puts(buffer_1, "minit-update: restoring status for ");
+ buffer_putsnlflush(buffer_1, root[i].name);
+ }
+
+ buf[0]='U';
+ copywrite(root[i].name);
+
+ read_reply_from_minit();
+
+ write(infd,&root[i],sizeof (struct process));
+
+ if (read_reply_from_minit() && verbose) {
+ buffer_puts(buffer_1, "minit-update: restored service ");
+ buffer_putsnlflush(buffer_1, root[i].name);
+ }
+
+ } /* for() */
+
+return 0;
+}
+
+
+ssize_t read_outfd(void *buf, size_t count) {
+ ssize_t br=read(outfd,buf,count);
+
+ if (br<0) buffer_puts_strerror("Error reading from outfd: ");
+return br;
+}
+
+
+void addprocess(struct process *p) {
+ if (maxprocess+1>=processalloc) {
+ struct process *fump;
+ processalloc+=8;
+ if ((fump=(struct process *)realloc(root,processalloc*sizeof(struct process)))==0) die("realloc() failed\n ");
+ root=fump;
+ }
+ memmove(&root[++maxprocess],p,sizeof(struct process));
+}
diff --git a/minit.c b/minit.c
@@ -28,22 +28,16 @@ extern void opendevconsole();
#define UPDATE
#ifdef UPDATE
-static int doupdate=0;
+static int doupdate;
#endif
static int i_am_init;
-static int infd,outfd;
-
extern int openreadclose(char *fn, char **buf, unsigned long *len);
extern char **split(char *buf,int c,int *len,int plus,int ofs);
extern char **environ;
-static int maxprocess=-1;
-
-static int processalloc=0;
-
/* return index of service in process data structure or -1 if not found */
int findservice(char *service) {
int i;
@@ -111,6 +105,8 @@ int loadservice(char *service) {
if (tmp.logservice>=0) {
int pipefd[2];
if (pipe(pipefd)) return -1;
+ fcntl(pipefd[0],F_SETFD,FD_CLOEXEC);
+ fcntl(pipefd[1],F_SETFD,FD_CLOEXEC);
root[tmp.logservice].__stdin=pipefd[0];
tmp.__stdout=pipefd[1];
}
@@ -213,10 +209,15 @@ again:
argv[0]++;
else
argv[0]=argv0;
- if (root[service].__stdin != 0) dup2(root[service].__stdin,0);
+ if (root[service].__stdin != 0) {
+ dup2(root[service].__stdin,0);
+ fcntl(0,F_SETFD,0);
+ }
if (root[service].__stdout != 1) {
dup2(root[service].__stdout,1);
dup2(root[service].__stdout,2);
+ fcntl(1,F_SETFD,0);
+ fcntl(2,F_SETFD,0);
}
{
int i;
@@ -346,9 +347,6 @@ int main(int argc, char *argv[]) {
infd=open("/etc/minit/in",O_RDWR);
outfd=open("/etc/minit/out",O_RDWR|O_NONBLOCK);
-
- fcntl(infd,F_SETFD,FD_CLOEXEC);
- fcntl(outfd,F_SETFD,FD_CLOEXEC);
if (getpid()==1) {
int fd;
@@ -380,10 +378,21 @@ int main(int argc, char *argv[]) {
pfd.fd=infd;
pfd.events=POLLIN;
+ fcntl(infd,F_SETFD,FD_CLOEXEC);
+ fcntl(outfd,F_SETFD,FD_CLOEXEC);
+
#ifdef UPDATE
- if( argc==2 && !strcmp(argv[1], "--update")) {
- doupdate=1;
- } else {
+ {
+ struct flock fl;
+ fl.l_whence=SEEK_CUR;
+ fl.l_start=0;
+ fl.l_len=0;
+ fl.l_pid=0;
+ if ( (0 == fcntl(infd,F_GETLK,&fl)) &&
+ (fl.l_type != F_UNLCK )) doupdate=1;
+ }
+
+ if(!doupdate) {
#endif
for (i=1; i<argc; i++) {
circsweep();
@@ -437,15 +446,13 @@ int main(int argc, char *argv[]) {
/* write(1,buf,str_len(buf)); write(1,"\n",1); */
#ifdef UPDATE
- if(!strcmp(buf,"update")) {
- char *newargs[]={"/sbin/minit", "--update" ,0};
- execve("/sbin/minit",newargs, environ);
- }
- idx=findservice(buf+1);
+ if(!strcmp(buf,"update")) {
+ execve("/sbin/minit",argv, environ);
+ }
- if (((buf[0]!='U') && buf[0]!='s') && (idx<0))
+ if (((buf[0]!='U') && buf[0]!='s') && ((idx=findservice(buf+1))<0))
#else
- if (buf[0]!='s' && (idx<0))
+ if (buf[0]!='s' && ((idx=findservice(buf+1))<0))
#endif
error:
write(outfd,"0",1);
@@ -466,7 +473,7 @@ error:
struct process tmp;
read(infd,&tmp,sizeof tmp);
tmp.name=strdup(buf+1);
- addprocess(&tmp);
+ addprocess(&tmp);
}
goto ok;
#endif
diff --git a/minit.h b/minit.h
@@ -11,3 +11,7 @@ static struct process {
int logservice;
} *root;
+static int infd,outfd;
+static int maxprocess=-1;
+static int processalloc;
+
