base-system-live-busybox: renamed to base-system-busybox, provides/conflicts procps.

This commit is contained in:
Juan RP
2012-09-17 15:50:27 +02:00
parent 61e1f080ae
commit 18631b5529
7 changed files with 7 additions and 6 deletions

View File

@@ -0,0 +1,10 @@
--- include/libbb.h.orig 2012-07-09 15:18:29.296170184 +0200
+++ include/libbb.h 2012-07-09 15:18:41.374877927 +0200
@@ -40,6 +40,7 @@
#include <sys/poll.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
+#include <sys/resource.h>
#include <sys/socket.h>
#include <sys/stat.h>
#include <sys/time.h>

View File

@@ -0,0 +1,22 @@
Add support for strictatime mount option.
https://bugs.busybox.net/show_bug.cgi?id=5474
--- util-linux/mount.c.orig 2012-08-29 16:30:19.164282575 +0200
+++ util-linux/mount.c 2012-08-29 16:30:03.088660739 +0200
@@ -235,6 +235,7 @@ static const int32_t mount_options[] = {
/* "noatime" */ MS_NOATIME,
/* "diratime" */ ~MS_NODIRATIME,
/* "nodiratime" */ MS_NODIRATIME,
+ /* "strictatime" */ MS_STRICTATIME,
/* "mand" */ MS_MANDLOCK,
/* "nomand" */ ~MS_MANDLOCK,
/* "relatime" */ MS_RELATIME,
@@ -291,6 +292,7 @@ static const char mount_option_str[] =
"noatime\0"
"diratime\0"
"nodiratime\0"
+ "strictatime\0"
"mand\0"
"nomand\0"
"relatime\0"