- pre3

Changed files:
    busybox-initrd.config -> 1.7
    busybox-insmod_ng.patch -> 1.7
    busybox-raid_start.patch -> 1.6
    busybox.config -> 1.3

diff --git a/busybox-initrd.config b/busybox-initrd.config
index bc411cf52e8a43ee32aff287bec6efcde3f06736..7db72274b572f61c4eeb3d54bf5b64ccdd530db9 100644 (file)
--- a/busybox-initrd.config
+++ b/busybox-initrd.config
@@ -190,6 +190,7 @@ CONFIG_USLEEP=y
 # CONFIG_CRONTAB is not set
 # CONFIG_DC is not set
 # CONFIG_DUTMP is not set
+# CONFIG_LAST is not set
 # CONFIG_HDPARM is not set
 # CONFIG_MAKEDEVS is not set
 # CONFIG_MT is not set

diff --git a/busybox-insmod_ng.patch b/busybox-insmod_ng.patch
index 018d3cfcd3349131bffd1cf4f6b7307537bc5a2a..dfbfa697768dfcbd7b83c436797c39b952487565 100644 (file)
--- a/busybox-insmod_ng.patch
+++ b/busybox-insmod_ng.patch
@@ -1,31 +1,3 @@
-diff -urN busybox-1.00-pre2.org/include/applets.h busybox-1.00-pre2/include/applets.h
---- busybox-1.00-pre2.org/include/applets.h    2003-08-02 23:46:48.000000000 +0200
-+++ busybox-1.00-pre2/include/applets.h        2003-08-03 12:04:46.000000000 +0200
-@@ -286,6 +286,9 @@
- #ifdef CONFIG_INSMOD
-       APPLET(insmod, insmod_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
- #endif
-+#ifdef CONFIG_FEATURE_REALLY_NEW_MODULE_INTERFACE
-+      APPLET(insmod_ng, insmod_ng_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
-+#endif
- #ifdef CONFIG_IP
-       APPLET(ip, ip_main, _BB_DIR_BIN, _BB_SUID_NEVER)
- #endif
-diff -urN busybox-1.00-pre2.org/include/usage.h busybox-1.00-pre2/include/usage.h
---- busybox-1.00-pre2.org/include/usage.h      2003-08-02 23:46:48.000000000 +0200
-+++ busybox-1.00-pre2/include/usage.h  2003-08-03 12:04:46.000000000 +0200
-@@ -1312,6 +1312,11 @@
-       "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n" \
-       "          [ ttl TTL ] [ tos TOS ] [ [no]pmtudisc ] [ dev PHYS_DEV ]\n"
- 
-+#define insmod_ng_trivial_usage \
-+      "MODULE [symbol=value]..."
-+#define insmod_ng_full_usage \
-+      "Loads the specified kernel modules into the kernel."
-+
- #define kill_trivial_usage \
-       "[-signal] process-id [process-id ...]"
- #define kill_full_usage \
 diff -urN busybox-1.00-pre2.org/modutils/Config.in busybox-1.00-pre2/modutils/Config.in
 --- busybox-1.00-pre2.org/modutils/Config.in   2003-08-02 23:46:49.000000000 +0200
 +++ busybox-1.00-pre2/modutils/Config.in       2003-08-03 12:04:46.000000000 +0200
@@ -45,24 +17,6 @@ diff -urN busybox-1.00-pre2.org/modutils/Config.in busybox-1.00-pre2/modutils/Co
  config CONFIG_FEATURE_INSMOD_VERSION_CHECKING
        bool "  Module version checking"
        default n
-diff -urN busybox-1.00-pre2.org/modutils/insmod.c busybox-1.00-pre2/modutils/insmod.c
---- busybox-1.00-pre2.org/modutils/insmod.c    2003-08-02 23:46:49.000000000 +0200
-+++ busybox-1.00-pre2/modutils/insmod.c        2003-08-03 12:04:46.000000000 +0200
-@@ -4049,6 +4049,14 @@
- 
-       printf("Using %s\n", m_filename);
- 
-+#ifdef CONFIG_FEATURE_REALLY_NEW_MODULE_INTERFACE
-+    if (create_module(NULL, 0) < 0 && errno == ENOSYS) {
-+              optind--;
-+              argv[optind] = m_filename;
-+              return insmod_ng_main(argc - optind, argv + optind);
-+    }
-+#endif
-+
-       if ((f = obj_load(fp, LOADBITS)) == NULL)
-               bb_perror_msg_and_die("Could not load the module");
- 
 diff -urN busybox-1.00-pre2.org/modutils/insmod_ng.c busybox-1.00-pre2/modutils/insmod_ng.c
 --- busybox-1.00-pre2.org/modutils/insmod_ng.c 1970-01-01 01:00:00.000000000 +0100
 +++ busybox-1.00-pre2/modutils/insmod_ng.c     2003-08-03 12:11:02.000000000 +0200

diff --git a/busybox-raid_start.patch b/busybox-raid_start.patch
index 7b6d3b5e8ba49ae1eafeb7d96fea225e4c15281b..2387d1eeeabc306b2260de42e50e7290cebdb5cd 100644 (file)
--- a/busybox-raid_start.patch
+++ b/busybox-raid_start.patch
@@ -11,22 +11,6 @@ diff -urN busybox-1.00-pre2.org/include/applets.h busybox-1.00-pre2/include/appl
  #ifdef CONFIG_RDATE
        APPLET(rdate, rdate_main, _BB_DIR_USR_SBIN, _BB_SUID_NEVER)
  #endif
-diff -urN busybox-1.00-pre2.org/include/usage.h busybox-1.00-pre2/include/usage.h
---- busybox-1.00-pre2.org/include/usage.h      2003-08-02 23:46:48.000000000 +0200
-+++ busybox-1.00-pre2/include/usage.h  2003-08-03 00:32:31.000000000 +0200
-@@ -1924,6 +1924,12 @@
-       "$ pwd\n" \
-       "/root\n"
- 
-+#define raid_start_trivial_usage \
-+      "MD_DEVICE DISK_DEVICES..."
-+#define raid_start_full_usage \
-+      "Start MD_DEVICE, taking superblock from DISK_DEVICES.\n" \
-+      "Example: raid_start /dev/md0 /dev/sdb /dev/sdc2"
-+      
- #define rdate_trivial_usage \
-       "[-sp] HOST"
- #define rdate_full_usage \
 diff -urN busybox-1.00-pre2.org/sysdeps/linux/defconfig busybox-1.00-pre2/sysdeps/linux/defconfig
 --- busybox-1.00-pre2.org/sysdeps/linux/defconfig      2003-08-02 23:46:49.000000000 +0200
 +++ busybox-1.00-pre2/sysdeps/linux/defconfig  2003-08-03 00:32:31.000000000 +0200

diff --git a/busybox.config b/busybox.config
index de50a0b00aed7c7912a0bffdb55f3431bd215d62..c89fda75aa8c990a0a902321eb7cdbde13d05778 100644 (file)
--- a/busybox.config
+++ b/busybox.config
@@ -278,6 +278,7 @@ CONFIG_FEATURE_CROND_CALL_SENDMAIL=y
 CONFIG_CRONTAB=y
 CONFIG_DC=y
 CONFIG_DUTMP=y
+CONFIG_LAST=y
 CONFIG_HDPARM=y
 # CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
 # CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set