vserver 1.9.5.x5

[linux-2.6.git] / arch / um / kernel / umid.c

diff --git a/arch/um/kernel/umid.c b/arch/um/kernel/umid.c
index 78c8dc4..186c288 100644 (file)
--- a/arch/um/kernel/umid.c
+++ b/arch/um/kernel/umid.c
@@ -54,6 +54,7 @@ static int __init set_umid(char *name, int is_random,
 
 static int __init set_umid_arg(char *name, int *add)
 {
+       *add = 0;
        return(set_umid(name, 0, printf));
 }
 
@@ -92,8 +93,8 @@ static int __init create_pid_file(void)
        fd = os_open_file(file, of_create(of_excl(of_rdwr(OPENFLAGS()))), 
                          0644);
        if(fd < 0){
-               printf("Open of machine pid file \"%s\" failed - "
-                      "err = %d\n", file, -fd);
+               printf("Open of machine pid file \"%s\" failed: %s\n",
+                      file, strerror(-fd));
                return 0;
        }
 
@@ -247,7 +248,7 @@ static int __init make_uml_dir(void)
        strcpy(uml_dir, dir);
        
        if((mkdir(uml_dir, 0777) < 0) && (errno != EEXIST)){
-               printf("Failed to mkdir %s - errno = %i\n", uml_dir, errno);
+               printf("Failed to mkdir %s: %s\n", uml_dir, strerror(errno));
                return(-1);
        }
        return 0;
@@ -264,8 +265,8 @@ static int __init make_umid(int (*printer)(const char *fmt, ...))
                strcat(tmp, "XXXXXX");
                fd = mkstemp(tmp);
                if(fd < 0){
-                       (*printer)("make_umid - mkstemp failed, errno = %d\n",
-                                  errno);
+                       (*printer)("make_umid - mkstemp(%s) failed: %s\n",
+                                  tmp,strerror(errno));
                        return(1);
                }
 
@@ -303,15 +304,14 @@ __uml_setup("uml_dir=", set_uml_dir,
 "    The location to place the pid and umid files.\n\n"
 );
 
-__uml_postsetup(make_uml_dir);
-
 static int __init make_umid_setup(void)
 {
-       return(make_umid(printf));
+       /* one function with the ordering we need ... */
+       make_uml_dir();
+       make_umid(printf);
+       return create_pid_file();
 }
-
 __uml_postsetup(make_umid_setup);
-__uml_postsetup(create_pid_file);
 
 /*
  * Overrides for Emacs so that we follow Linus's tabbing style.