Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/init/halt.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/init/halt.c (modified) (3 diffs)

branches/3.3/mindi-busybox/init/halt.c

@@ -75 +75 @@
 static void write_wtmp(void)
 {
-    struct utmp utmp;
+    struct utmpx utmp;
     struct utsname uts;
     /* "man utmp" says wtmp file should *not* be created automagically */
@@ -89 +89 @@
     uname(&uts);
     safe_strncpy(utmp.ut_host, uts.release, sizeof(utmp.ut_host));
-    updwtmp(bb_path_wtmp_file, &utmp);
+    updwtmpx(bb_path_wtmp_file, &utmp);
 }
 #else
@@ -136 +136 @@
 //TODO: I tend to think that signalling linuxrc is wrong
 // pity original author didn't comment on it...
-        if (ENABLE_FEATURE_INITRD) {
+        if (ENABLE_LINUXRC) {
             /* talk to linuxrc */
             /* bbox init/linuxrc assumed */