SOURCES: initng-utmpx.patch, initng-vserver.patch - update to 0.6....

[glen]

Author: glen                         Date: Thu Apr 20 09:28:09 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- update to 0.6.1RC1

---- Files affected:
SOURCES:
   initng-utmpx.patch (1.5 -> 1.6) , initng-vserver.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/initng-utmpx.patch
diff -u SOURCES/initng-utmpx.patch:1.5 SOURCES/initng-utmpx.patch:1.6
--- SOURCES/initng-utmpx.patch:1.5	Wed Mar 22 21:32:57 2006
+++ SOURCES/initng-utmpx.patch	Thu Apr 20 11:28:03 2006
@@ -4,23 +4,23 @@
 --- initng-0.6.0RC1/plugins/initctl/initng_initctl.c~	2006-03-22 14:29:42.000000000 +0200
 +++ initng-0.6.0RC1/plugins/initctl/initng_initctl.c	2006-03-22 22:14:24.000000000 +0200
 @@ -236,19 +236,7 @@
-     struct utmp utmp;
-     time_t t;
+ 	struct utmp utmp;
+ 	time_t t;
  
--    /*
--     * this is created by bootmisc, if this isn't there we can't set runlevel.
--     */
--    if (access(UTMP_FILE, F_OK) < 0)
--    {
--        F_("/var/run/utmp does not exist, this should be created by bootmisc.i\n");
--        return;
--    }
--    /*
--       TODO, is this a good idea or a bad idea?
--       utmpname("/var/run/utmp");
--     */
+-	/*
+-	 * this is created by bootmisc, if this isn't there we can't set runlevel.
+-	 */
+-	if (access(UTMP_FILE, F_OK) < 0)
+-	{
+-		F_("/var/run/utmp does not exist, this should be created by bootmisc.i\n");
+-		return;
+-	}
+-	/*
+-	   TODO, is this a good idea or a bad idea?
+-	   utmpname("/var/run/utmp");
+-	 */
 -
 +    utmpname(UTMP_FILE);
-     setutent();
-     memset(&utmp, 0, sizeof(utmp));
-     utmp.ut_type = RUN_LVL;
+ 	setutent();
+ 	memset(&utmp, 0, sizeof(utmp));
+ 	utmp.ut_type = RUN_LVL;

================================================================
Index: SOURCES/initng-vserver.patch
diff -u SOURCES/initng-vserver.patch:1.3 SOURCES/initng-vserver.patch:1.4
--- SOURCES/initng-vserver.patch:1.3	Wed Mar 22 20:14:12 2006
+++ SOURCES/initng-vserver.patch	Thu Apr 20 11:28:04 2006
@@ -1,43 +1,42 @@
 --- initng-0.6.0RC1/src/initng_main.c~	2006-03-22 14:29:42.000000000 +0200
 +++ initng-0.6.0RC1/src/initng_main.c	2006-03-22 20:57:02.000000000 +0200
-@@ -152,19 +152,27 @@
+@@ -185,19 +185,27 @@
  
-     /* Mount readonly, youst to be extra sure this is done */
-     mount("/dev/root", "/", NULL, MS_RDONLY + MS_REMOUNT, NULL);
--
--    if (errno == EBUSY)
--    {
--        F_("Failed to remount / ro, EBUSY\n");
--    }
--
--    /* check so that / is mounted read only, by trying to open a file */
--    if ((test = fopen("/initng_write_testfile", "w")) != NULL)
--    {
--        fclose(test);
--        unlink("/initng_write_testfile");
--        F_("/ IS NOT REMOUNTED READ-ONLY, WONT REBOOT/HALT BECAUSE THE FILE SYSTEM CAN BREAK!\n");
--        return;
-+    switch (errno) {
-+        case 0:
-+            break;
-+
-+        case EINVAL:
-+        case EPERM:
-+	    /* This fix is there to get clean shutdown of virtual hosts missing CAP_SYS_ADMIN */
-+            break;
+ 	/* Mount readonly, youst to be extra sure this is done */
+ 	mount("/dev/root", "/", NULL, MS_RDONLY + MS_REMOUNT, NULL);
++	switch (errno) {
++	case 0:
++		break;
 +
-+        case EBUSY:
-+        default:
-+            F_("Failed to remount / ro because: %s\n", strerror(errno));
++	case EINVAL:
++	case EPERM:
++		/* This fix is there to get clean shutdown of virtual hosts missing CAP_SYS_ADMIN */
++		break;
 +
-+			/* check so that / is mounted read only, by trying to open a file */
-+			if ((test = fopen("/initng_write_testfile", "w")) != NULL)
-+			{
-+				fclose(test);
-+				unlink("/initng_write_testfile");
-+				F_("/ IS NOT REMOUNTED READ-ONLY, WONT REBOOT/HALT BECAUSE THE FILE SYSTEM CAN BREAK!\n");
-+				return;
-+			}
-     }
++	case EBUSY:
++	default:
++		F_("Failed to remount / ro because: %s\n", strerror(errno));
+ 
+-	if (errno == EBUSY)
+-	{
+-		F_("Failed to remount / ro, EBUSY\n");
+-	}
+-
+-	/* check so that / is mounted read only, by trying to open a file */
+-	if ((test = fopen("/initng_write_testfile", "w")) != NULL)
+-	{
+-		fclose(test);
+-		unlink("/initng_write_testfile");
+-		F_("/ IS NOT REMOUNTED READ-ONLY, WONT REBOOT/HALT BECAUSE THE FILE SYSTEM CAN BREAK!\n");
+-		return;
++		/* check so that / is mounted read only, by trying to open a file */
++		if ((test = fopen("/initng_write_testfile", "w")) != NULL)
++		{
++			fclose(test);
++			unlink("/initng_write_testfile");
++			F_("/ IS NOT REMOUNTED READ-ONLY, WONT REBOOT/HALT BECAUSE THE FILE SYSTEM CAN BREAK!\n");
++			return;
++		}
+ 	}
  
-     /* Under certain unknown circumstances, calling reboot(RB_POWER_OFF) from
+ 	/* Under certain unknown circumstances, calling reboot(RB_POWER_OFF) from
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/initng-utmpx.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SOURCES/initng-vserver.patch?r1=1.3&r2=1.4&f=u