gmane.linux.busybox

Re: [PATCH] Allow XZ streaming format in tar.

Denys Vlasenko — 2012-05-24T06:59:53

Patch is whitespace-damaged.


You did not add --xz long option, only short one, -J.



Shouldn't this be "unxz"?

Re: MAC address deny in udhcpd

Denys Vlasenko — 2012-05-24T06:27:29

No, you can't:

udhcpd: can't parse line 57 in udhcpd.conf



You can block incoming packets by MAC using iptables.
This way, all traffic can be ignored, not only DHCP one.

Problems with --sort-section=alignment

Rich Felker — 2012-05-24T00:21:51

Busybox is linked with --sort-section=alignment, and this seems to be
causing an obscure bugs one of my users experienced building busybox
on ARM/musl target. I've filed a bug report with binutils, but I'm not
sure where the issue should be addressed. See here:

http://sourceware.org/bugzilla/show_bug.cgi?id=14156

Basically, --sort-section=alignment wants to reorder the .init
section, which is not possible. The problem does not show up on other
targets, but I can't see anything that inhibits reordering .init, so
it seems to be working only by chance...

Rich

RE: MAC address deny in udhcpd

Tom Isaacson — 2012-05-23T10:22:28

-----Original Message-----

No thoughts at all?

Tom

swapon: implementing discard option.

Andy Lee — 2012-05-23T01:02:59

Hi,

This makes swapon to use discard option.
Enable support for discarding freed pages before they are reused.

Cheers,
Andy

---
 util-linux/Config.src  |    7 +++++++
 util-linux/swaponoff.c |   41 +++++++++++++++++++++++++++++++++--------
 2 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/util-linux/Config.src b/util-linux/Config.src
index 57a52ce..84652eb 100644
--- a/util-linux/Config.src
+++ b/util-linux/Config.src
< at >< at > -606,6 +606,13 < at >< at > config FEATURE_SWAPON_PRI
 help
   Enable support for setting swap device priority in swapon.

+config FEATURE_SWAPON_DISCARD
+bool "Support discard option -d"
+default y
+depends on SWAPONOFF
+help
+  Enable support for discarding freed pages before they are reused.
+
 config SWITCH_ROOT
 bool "switch_root"
 default y
diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c
index 54867ec..d911b31 100644
--- a/util-linux/swaponoff.c
+++ b/util-linux/swaponoff.c
< at >< at > -8,10 +8,13 < at >< at >
  */

 //usage:#define swapon_trivial_usage
-//usage:       "[-a]" IF_FEATURE_SWAPON_PRI(" [-p PRI]") " [DEVICE]"
+//usage:       "[-a]" IF_FEATURE_SWAPON_DISCARD(" [-d]")
IF_FEATURE_SWAPON_PRI(" [-p PRI]") " [DEVICE]"
 //usage:#define swapon_full_usage "\n\n"
 //usage:       "Start swapping on DEVICE\n"
 //usage:     "\n-aStart swapping on all swap devices"
+//usage:IF_FEATURE_SWAPON_DISCARD(
+//usage:     "\n-dDiscard freed pages before they are used"
+//usage:)
 //usage:IF_FEATURE_SWAPON_PRI(
 //usage:     "\n-p PRISet swap device priority"
 //usage:)
< at >< at > -28,6 +31,17 < at >< at >
 # include <sys/swap.h>
 #endif

+#if ENABLE_FEATURE_SWAPON_DISCARD
+#ifndef SWAP_FLAG_DISCARD
+#define SWAP_FLAG_DISCARD   0x10000 /* discard swap cluster after use */
+#endif
+#if ENABLE_FEATURE_SWAPON_PRI
+#define OPT_DISCARD (1 << 2)
+#else
+#define OPT_DISCARD (1 << 1)
+#endif
+#endif
+
 #if ENABLE_FEATURE_MOUNT_LABEL
 # include "volume_id.h"
 #else
< at >< at > -38,7 +52,7 < at >< at >
 # define MNTTYPE_SWAP "swap"
 #endif

-#if ENABLE_FEATURE_SWAPON_PRI
+#if ENABLE_FEATURE_SWAPON_PRI || ENABLE_FEATURE_SWAPON_DISCARD
 struct globals {
 int flags;
 } FIX_ALIASING;
< at >< at > -113,28 +127,39 < at >< at > int swap_on_off_main(int argc UNUSED_PARAM, char **argv)

 INIT_G();

-#if !ENABLE_FEATURE_SWAPON_PRI
+#if !ENABLE_FEATURE_SWAPON_PRI && !ENABLE_FEATURE_SWAPON_DISCARD
 ret = getopt32(argv, "a");
 #else
+#if ENABLE_FEATURE_SWAPON_PRI
 if (applet_name[5] == 'n')
 opt_complementary = "p+";
-ret = getopt32(argv, (applet_name[5] == 'n') ? "ap:" : "a", &g_flags);
+#endif
+ret = getopt32(argv, (applet_name[5] == 'n') ?
+"a" IF_FEATURE_SWAPON_PRI("p:") IF_FEATURE_SWAPON_DISCARD("d") :
+"a", &g_flags);

+#if ENABLE_FEATURE_SWAPON_PRI
 if (ret & 2) { // -p
-g_flags = SWAP_FLAG_PREFER |
+g_flags |= SWAP_FLAG_PREFER |
 ((g_flags & SWAP_FLAG_PRIO_MASK) << SWAP_FLAG_PRIO_SHIFT);
-ret &= 1;
 }
 #endif

-if (ret /* & 1: not needed */) // -a
+#if ENABLE_FEATURE_SWAPON_DISCARD
+if (ret & OPT_DISCARD) { // -d
+g_flags |= SWAP_FLAG_DISCARD;
+}
+#endif
+#endif //!ENABLE_FEATURE_SWAPON_PRI && !ENABLE_FEATURE_SWAPON_DISCARD
+
+if (ret & 1) // -a
 return do_em_all();

 argv += optind;
 if (!*argv)
 bb_show_usage();

-/* ret = 0; redundant */
+ret = 0;
 do {
 ret += swap_enable_disable(*argv);
 } while (*++argv);

Re: patches for building with Android NDK

Rob Walker — 2012-05-22T17:01:51

Certainly.  I very much agree with that.

I was didn't mean for the above question to be rhetorical.  I'm quite
new to BusyBox, and am therefore curious.

-Rob

[PATCH] unzip: ignore chmod errors

Natanael Copa — 2012-05-22T15:11:46

This makes unzip to FAT filesystems not exit with error.

This similar to how the "normal" unzip works.

Signed-off-by: Natanael Copa <ncopa< at >alpinelinux.org>
---
 archival/unzip.c       |    2 +-
 include/libbb.h        |    1 +
 libbb/make_directory.c |    7 ++++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/archival/unzip.c b/archival/unzip.c
index 3c76cda..c1b945a 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
< at >< at > -596,7 +596,7 < at >< at > int unzip_main(int argc, char **argv)
 printf("   creating: %s\n", dst_fn);
 }
 unzip_create_leading_dirs(dst_fn);
-if (bb_make_directory(dst_fn, dir_mode, 0)) {
+if (bb_make_directory(dst_fn, dir_mode, FILEUTILS_IGNORE_CHMOD_ERR)) {
 xfunc_die();
 }
 } else {
diff --git a/include/libbb.h b/include/libbb.h
index f12800f..5e5c8c7 100644
--- a/include/libbb.h
+++ b/include/libbb.h
< at >< at > -333,6 +333,7 < at >< at > enum {/* DO NOT CHANGE THESE VALUES!  cp.c, mv.c, install.c depend on them. */
 FILEUTILS_PRESERVE_SECURITY_CONTEXT = 1 << 9, /* -c */
 FILEUTILS_SET_SECURITY_CONTEXT = 1 << 10,
 #endif
+FILEUTILS_IGNORE_CHMOD_ERR = 1 << 11,
 };
 #define FILEUTILS_CP_OPTSTR "pdRfilsLH" IF_SELINUX("c")
 extern int remove_file(const char *path, int flags) FAST_FUNC;
diff --git a/libbb/make_directory.c b/libbb/make_directory.c
index 72303e7..7826b90 100644
--- a/libbb/make_directory.c
+++ b/libbb/make_directory.c
< at >< at > -107,6 +107,10 < at >< at > int FAST_FUNC bb_make_directory(char *path, long mode, int flags)
  * an error. */
 if ((mode != -1) && (chmod(path, mode) < 0)) {
 fail_msg = "set permissions of";
+if (flags & FILEUTILS_IGNORE_CHMOD_ERR) {
+flags = 0;
+goto print_err;
+}
 break;
 }
 goto ret0;
< at >< at > -116,8 +120,9 < at >< at > int FAST_FUNC bb_make_directory(char *path, long mode, int flags)
 *s = c;
 } /* while (1) */
 
-bb_perror_msg("can't %s directory '%s'", fail_msg, path);
 flags = -1;
+ print_err:
+bb_perror_msg("can't %s directory '%s'", fail_msg, path);
 goto ret;
  ret0:
 flags = 0;

Re: [PATCH] unzip: ignore chmod errors

Natanael Copa — 2012-05-22T15:11:19

I forgot the signed-off...

I will resend. sorry


On Tue, May 22, 2012 at 4:56 PM, Natanael Copa <natanael.copa< at >gmail.com> wrote:

[PATCH] unzip: ignore chmod errors

Natanael Copa — 2012-05-22T14:56:22

This makes unzip to FAT filesystems not exit with error.

This similar to how the "normal" unzip works.
---
 archival/unzip.c       |    2 +-
 include/libbb.h        |    1 +
 libbb/make_directory.c |    7 ++++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/archival/unzip.c b/archival/unzip.c
index 3c76cda..c1b945a 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
< at >< at > -596,7 +596,7 < at >< at > int unzip_main(int argc, char **argv)
 printf("   creating: %s\n", dst_fn);
 }
 unzip_create_leading_dirs(dst_fn);
-if (bb_make_directory(dst_fn, dir_mode, 0)) {
+if (bb_make_directory(dst_fn, dir_mode, FILEUTILS_IGNORE_CHMOD_ERR)) {
 xfunc_die();
 }
 } else {
diff --git a/include/libbb.h b/include/libbb.h
index f12800f..5e5c8c7 100644
--- a/include/libbb.h
+++ b/include/libbb.h
< at >< at > -333,6 +333,7 < at >< at > enum {/* DO NOT CHANGE THESE VALUES!  cp.c, mv.c, install.c depend on them. */
 FILEUTILS_PRESERVE_SECURITY_CONTEXT = 1 << 9, /* -c */
 FILEUTILS_SET_SECURITY_CONTEXT = 1 << 10,
 #endif
+FILEUTILS_IGNORE_CHMOD_ERR = 1 << 11,
 };
 #define FILEUTILS_CP_OPTSTR "pdRfilsLH" IF_SELINUX("c")
 extern int remove_file(const char *path, int flags) FAST_FUNC;
diff --git a/libbb/make_directory.c b/libbb/make_directory.c
index 72303e7..7826b90 100644
--- a/libbb/make_directory.c
+++ b/libbb/make_directory.c
< at >< at > -107,6 +107,10 < at >< at > int FAST_FUNC bb_make_directory(char *path, long mode, int flags)
  * an error. */
 if ((mode != -1) && (chmod(path, mode) < 0)) {
 fail_msg = "set permissions of";
+if (flags & FILEUTILS_IGNORE_CHMOD_ERR) {
+flags = 0;
+goto print_err;
+}
 break;
 }
 goto ret0;
< at >< at > -116,8 +120,9 < at >< at > int FAST_FUNC bb_make_directory(char *path, long mode, int flags)
 *s = c;
 } /* while (1) */
 
-bb_perror_msg("can't %s directory '%s'", fail_msg, path);
 flags = -1;
+ print_err:
+bb_perror_msg("can't %s directory '%s'", fail_msg, path);
 goto ret;
  ret0:
 flags = 0;

Re: patches for building with Android NDK

Tias — 2012-05-22T07:56:38

I'm not trying to imply that all applets should be supported on android...

Its just that a number of 'basic' applets such as bbconfig, date, df, 
fsck, kill, mke2fs, mount, ipv6 support etc. can currently not be built.
For many of these applets rather simple patches are already floating 
around, so it makes sense to integrate them upstream, no?


Kind regards,
Tias

Re: patches for building with Android NDK

Rob Walker — 2012-05-22T06:23:55

I get the feeling that Android's deliberately different in many of these
areas and that a fair number of applets are gonna be broken no matter
what.  The ROI's just too low to emulate or fix.  However, isn't this
true of a lot of other configurations that BusyBox supports?

What kind of system has FULL support?  I.e. every applet compiles and works?

Thanks,
Rob

On 5/21/12 10:54 PM, Tito wrote:

Re: patches for building with Android NDK

Tito — 2012-05-22T05:54:47

Hi,
at a first glance a few of this patches seems to add missing syscalls
and IMO they should be added to bionic libc and not to busybox
or at least not to the applets' files, maybe they could be added to
a platform.h file. 
Had not time to look at all of them tough.

Ciao,
Tito

patches for building with Android NDK

Tias — 2012-05-21T22:03:54

Dear Busybox developers,

Since Rob Walker's patch[1], building busybox with the Android NDK has 
really become dead simple; no special hacks or external libraries are 
needed anymore.

However, a large number of applets can currently not be built.

I started documenting why applets don't build, as well as collecting 
patches from different sources, that fix the issues:
https://github.com/tias/android-busybox-ndk
https://github.com/tias/android-busybox-ndk/tree/master/patches

I would love to see the ideas behind these patches integrated, so that a 
standard busybox build can be used in the many android open-source 
projects that depend on it (and currently use a statically built 
third-party blob).


However, I am unfamiliar with the coding practices of the busybox 
community, and many of these patches were written to fix the build and 
not necessarily to get merged upstream.
I consider my work in collecting these patches as just a first step.
Hence, I would like to solicit feedback on what can and can not be 
merged, and what would be required to get these fixes in.


Thanks in advance,
Tias

[1] http://lists.busybox.net/pipermail/busybox/2012-March/077486.html

[PATCH] Allow XZ streaming format in tar.

Boris Reisig — 2012-05-21T19:24:17

Here's a patch that will allow tar to uncompress XZ file formats when it 
can't properly detect XZ data formats when the input data comes from the 
standard input.  I have added the (-J) option to force tar to recognize 
XZ file format. Without this patch, it won't work with data streams.

Example: wget -O - http://192.168.0.1/1.xz | tar -xvJf -

diff -uNr busybox-original/archival/tar.c busybox/archival/tar.c
--- busybox-original/archival/tar.c     2012-05-21 00:19:38.876360998 -0500
+++ busybox/archival/tar.c      2012-05-21 00:05:08.299222265 -0500
< at >< at > -693,6 +693,7 < at >< at >
  //usage:       "-[" IF_FEATURE_TAR_CREATE("c") "xt"
  //usage:       IF_FEATURE_SEAMLESS_Z("Z")
  //usage:       IF_FEATURE_SEAMLESS_GZ("z")
+//usage:       IF_FEATURE_SEAMLESS_XZ("J")
  //usage:       IF_FEATURE_SEAMLESS_BZ2("j")
  //usage:       IF_FEATURE_SEAMLESS_LZMA("a")
  //usage:       IF_FEATURE_TAR_CREATE("h")
< at >< at > -719,6 +720,9 < at >< at >
  //usage:       IF_FEATURE_SEAMLESS_GZ(
  //usage:     "\n       z       (De)compress using gzip"
  //usage:       )
+//usage:       IF_FEATURE_SEAMLESS_XZ(
+//usage:     "\n       J       (De)compress using xz"
+//usage:       )
  //usage:       IF_FEATURE_SEAMLESS_BZ2(
  //usage:     "\n       j       (De)compress using bzip2"
  //usage:       )
< at >< at > -765,6 +769,7 < at >< at >
         IF_FEATURE_TAR_FROM(     OPTBIT_INCLUDE_FROM,)
         IF_FEATURE_TAR_FROM(     OPTBIT_EXCLUDE_FROM,)
         IF_FEATURE_SEAMLESS_GZ(  OPTBIT_GZIP        ,)
+       IF_FEATURE_SEAMLESS_XZ(  OPTBIT_XZ          ,)
         IF_FEATURE_SEAMLESS_Z(   OPTBIT_COMPRESS    ,) // 16th bit
         IF_FEATURE_TAR_NOPRESERVE_TIME(OPTBIT_NOPRESERVE_TIME,)
  #if ENABLE_FEATURE_TAR_LONG_OPTIONS
< at >< at > -790,6 +795,7 < at >< at >
         OPT_INCLUDE_FROM = IF_FEATURE_TAR_FROM(     (1 << 
OPTBIT_INCLUDE_FROM)) + 0, // T
         OPT_EXCLUDE_FROM = IF_FEATURE_TAR_FROM(     (1 << 
OPTBIT_EXCLUDE_FROM)) + 0, // X
         OPT_GZIP         = IF_FEATURE_SEAMLESS_GZ(  (1 << 
OPTBIT_GZIP        )) + 0, // z
+       OPT_XZ           = IF_FEATURE_SEAMLESS_XZ(  (1 << 
OPTBIT_XZ          )) + 0, // z
         OPT_COMPRESS     = IF_FEATURE_SEAMLESS_Z(   (1 << 
OPTBIT_COMPRESS    )) + 0, // Z
         OPT_NOPRESERVE_TIME = IF_FEATURE_TAR_NOPRESERVE_TIME((1 << 
OPTBIT_NOPRESERVE_TIME)) + 0, // m
         OPT_NORECURSION     = IF_FEATURE_TAR_LONG_OPTIONS((1 << 
OPTBIT_NORECURSION    )) + 0, // no-recursion
< at >< at > -798,7 +804,7 < at >< at >
         OPT_NOPRESERVE_PERM = IF_FEATURE_TAR_LONG_OPTIONS((1 << 
OPTBIT_NOPRESERVE_PERM)) + 0, // no-same-permissions
         OPT_OVERWRITE       = IF_FEATURE_TAR_LONG_OPTIONS((1 << 
OPTBIT_OVERWRITE      )) + 0, // overwrite

-       OPT_ANY_COMPRESS = (OPT_BZIP2 | OPT_LZMA | OPT_GZIP | OPT_COMPRESS),
+       OPT_ANY_COMPRESS = (OPT_BZIP2 | OPT_LZMA | OPT_GZIP | OPT_XZ | 
OPT_COMPRESS),
  };
  #if ENABLE_FEATURE_TAR_LONG_OPTIONS
  static const char tar_longopts[] ALIGN1 =
< at >< at > -924,6 +930,7 < at >< at >
                 IF_FEATURE_SEAMLESS_LZMA("a"   )
                 IF_FEATURE_TAR_FROM(     "T:X:")
                 IF_FEATURE_SEAMLESS_GZ(  "z"   )
+               IF_FEATURE_SEAMLESS_XZ(  "J"   )
                 IF_FEATURE_SEAMLESS_Z(   "Z"   )
                 IF_FEATURE_TAR_NOPRESERVE_TIME("m")
                 , &base_dir // -C dir
< at >< at > -1076,6 +1083,9 < at >< at >
                 if (opt & OPT_LZMA)
                         USE_FOR_MMU(xformer = unpack_lzma_stream;)
                         USE_FOR_NOMMU(xformer_prog = "unlzma";)
+               if (opt & OPT_XZ)
+                       USE_FOR_MMU(xformer = unpack_xz_stream;)
+                       USE_FOR_NOMMU(xformer_prog = "xz";)

                 open_transformer_with_sig(tar_handle->src_fd, xformer, 
xformer_prog);
                 /* Can't lseek over pipes */

Re: mdev with USB wifi adapters

Laurent Bercot — 2012-05-21T11:56:20

 To avoid this kind of race condition (due to the hotplug interface
spawning helpers in parallel instead of sequentially), you can use
s6-devd along with mdev. s6-devd just listens to the netlink interface
and spawns helpers sequentially.

 http://www.skarnet.org/software/s6-linux-utils/s6-devd.html

Re: mdev with USB wifi adapters

Walter Dnes — 2012-05-21T06:47:57

On Fri, May 18, 2012 at 10:49:05AM +0200, Denys Vlasenko wrote


  What I've been doing is to insert generic "print" code into the mdev
scripts. E.g....

exec 3>> /dev/shm/logfile.txt
printenv >&3
echo "===separator===" >&3
exec 3>&-

  This works in in my sh and bash.  Of course, in linux sh is merely a
symlink to bash.  Can anybody confirm this works in "real sh"?  See
http://tldp.org/LDP/abs/html/io-redirection.html for details.  Note that
bash may use file descriptor 5 internally, so you're limited to
3,4,6,7,8,9.  If you get desparate, close 0, 1, and 2 and re-use them.

  Anyhow, I got an important clue re some problems I'm having with
automount and unmount.  Inserting a USB key or drive generates multiple
events, e.g.

one event for /dev/sdb
one event for /dev/sdb1

and presumably one event for each and every partition.  I also assume
when receiving an event to create /dev/sdb1, I should put a sleep loop
in the script that gets activated if /dev/sdb doesn't exist yet <G>.
Now that I know what I'm up against, I can get on with it.

Re: [PATCH] Fix link time error for functions calling check_signature16()

Denys Vlasenko — 2012-05-20T10:57:40

On Fri, May 18, 2012 at 3:34 AM, Anthony G. Basile
<basile< at >opensource.dyc.edu> wrote:

Thanks! I reproduced the problem and committed a minimal fix.

Re: [mdev] Telling the kernel that there was no firmware.

Denys Vlasenko — 2012-05-19T21:40:39

Applied, thanks!

Re: mdev with USB wifi adapters

Denys Vlasenko — 2012-05-19T20:25:21

Well, we can easily take it to the extreme and make mdev call
the same script for all hotplug actions. As a nice bonus,
mdev.conf will be much simpler: just one line with script name ;)

It would work too, but I suspect no one would like it :)

I feel having device hotplug configuration smeared across
mdev.conf and a bunch of scripts (with two different formats)
is less convenient than having them in one place - mdev.conf.

Re: mdev with USB wifi adapters

Christoph Lohmann — 2012-05-18T16:28:44

Greetings.

After  spending some hours rewriting my init scripts in the rage because
some assholes decided to move /lib/firmware to /usr/lib/firmware, here’s
my answer:

On Fri, 18 May 2012 18:28:44 +0200 Denys Vlasenko <vda.linux< at >googlemail.com> wrote:

The examples you mentioned are only rarely executed, so they could easi‐
ly replaced with:

$SUBSYSTEM=scsiroot:disk 660 < at >/lib/mdev/scsidev

Then  the  environment is handled in that script. Mdev would need to ex‐
port the variables of course.


As  mentioned  above, I don’t see any need to make mdev more complex be‐
cause of a small set of corner‐cases. Removing the special case  of  the
SUBSYSTEM/DEVNAME match would remove the concerns. Simply exporting  all
variables the kernel gives back would only require  mdev.conf  rewrites,
if  the  kernel  scheme would change to something completely ugly in the
future.


Sincerely,

Christoph Lohmann

_______________________________________________
busybox mailing list
busybox< at >busybox.net
http://lists.busybox.net/mailman/listinfo/busybox

Re: [PATCH] syslogd should use _PATH_LOG when available

Cédric Cabessa — 2012-05-18T15:51:05

Hello,

May I have some feedback on this patch ?

To give a little more background, I work on the android platform and
android already uses /dev/log as a folder for their own log system
(logcat).
I think it will be better if we can get _PATH_LOG from the platform
specific syslog header.
Of course, if _PATH_LOG is not defined, we use /dev/log as we are used to.

Thanks