path: root/urunlevel/runlevel/runlevel.patch

diff -urNX busybox-1.00/runlevel/diff_excludes busybox-1.00-original/Makefile busybox-1.00/Makefile
--- busybox-1.00-original/Makefile	2004-10-08 17:45:08.000000000 +1000
+++ busybox-1.00/Makefile	2005-03-12 00:58:35.000000000 +1000
@@ -40,9 +40,9 @@
 include $(top_builddir)/Rules.mak
 
 DIRS:=applets archival archival/libunarchive coreutils console-tools \
-	debianutils editors findutils init miscutils modutils networking \
+	debianutils editors findutils init miscutils modutils my_linux networking \
 	networking/libiproute networking/udhcp procps loginutils shell \
-	sysklogd util-linux libpwdgrp coreutils/libcoreutils libbb
+	sysklogd runlevel util-linux libpwdgrp coreutils/libcoreutils libbb
 
 SRC_DIRS:=$(patsubst %,$(top_srcdir)/%,$(DIRS))
 
diff -urNX busybox-1.00/runlevel/diff_excludes busybox-1.00-original/include/applets.h busybox-1.00/include/applets.h
--- busybox-1.00-original/include/applets.h	2004-08-27 09:01:34.000000000 +1000
+++ busybox-1.00/include/applets.h	2005-03-14 09:37:26.000000000 +1000
@@ -75,6 +75,18 @@
 #ifdef CONFIG_BASENAME
 	APPLET(basename, basename_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
 #endif
+#ifdef CONFIG_BOOT_NAMED
+	APPLET(boot_named, boot_named_main, _BB_DIR_USR_SBIN, _BB_SUID_NEVER)
+#endif
+#ifdef CONFIG_BOOT_PORTMAP
+	APPLET(boot_portmap, boot_portmap_main, _BB_DIR_USR_SBIN, _BB_SUID_NEVER)
+#endif
+#ifdef CONFIG_BOOT_SYSLOG
+	APPLET(boot_syslog, boot_syslog_main, _BB_DIR_USR_SBIN, _BB_SUID_NEVER)
+#endif
+#ifdef CONFIG_BOOT_TIME
+	APPLET(boot_time, boot_time_main, _BB_DIR_USR_SBIN, _BB_SUID_NEVER)
+#endif
 #ifdef CONFIG_BUNZIP2
 	APPLET(bunzip2, bunzip2_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
 #endif
@@ -226,6 +238,9 @@
 #ifdef CONFIG_GETOPT
 	APPLET(getopt, getopt_main, _BB_DIR_BIN, _BB_SUID_NEVER)
 #endif
+#ifdef CONFIG_GETPKG
+	APPLET(getpkg, getpkg_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
+#endif
 #ifdef CONFIG_GETTY
 	APPLET(getty, getty_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
 #endif
@@ -289,6 +304,9 @@
 #ifdef CONFIG_INSTALL
 	APPLET(install, install_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
 #endif
+#ifdef CONFIG_INSTALL_INITD
+	APPLET(install_initd, install_initd_main, _BB_DIR_USR_SBIN, _BB_SUID_NEVER)
+#endif
 #ifdef CONFIG_IP
 	APPLET(ip, ip_main, _BB_DIR_BIN, _BB_SUID_NEVER)
 #endif
@@ -313,6 +331,9 @@
 #ifdef CONFIG_KILLALL
 	APPLET(killall, kill_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
 #endif
+#ifdef CONFIG_KILLPROC
+	APPLET(killproc, killproc_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
+#endif
 #ifdef CONFIG_KLOGD
 	APPLET(klogd, klogd_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
 #endif
@@ -328,6 +349,9 @@
 #ifdef CONFIG_FEATURE_INITRD
 	APPLET_NOUSAGE("linuxrc", init_main, _BB_DIR_ROOT, _BB_SUID_NEVER)
 #endif
+#ifdef CONFIG_LINUXRC
+	APPLET(linuxrc, linuxrc_main, _BB_DIR_ROOT, _BB_SUID_NEVER)
+#endif
 #ifdef CONFIG_LN
 	APPLET(ln, ln_main, _BB_DIR_BIN, _BB_SUID_NEVER)
 #endif
@@ -337,6 +361,18 @@
 #ifdef CONFIG_LOADKMAP
 	APPLET(loadkmap, loadkmap_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
 #endif
+#ifdef CONFIG_LOCAL_FS
+	APPLET(local_fs, local_fs_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
+#endif
+#ifdef CONFIG_LOG_FAILURE_MSG
+	APPLET(log_failure_msg, log_failure_msg_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
+#endif
+#ifdef CONFIG_LOG_SUCCESS_MSG
+	APPLET(log_success_msg, log_success_msg_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
+#endif
+#ifdef CONFIG_LOG_WARNING_MSG
+	APPLET(log_warning_msg, log_warning_msg_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
+#endif
 #ifdef CONFIG_LOGGER
 	APPLET(logger, logger_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
 #endif
@@ -361,6 +397,9 @@
 #ifdef CONFIG_MAKEDEVS
 	APPLET(makedevs, makedevs_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
 #endif
+#ifdef CONFIG_MAN
+	APPLET(man, man_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
+#endif
 #ifdef CONFIG_MD5SUM
 	APPLET(md5sum, md5sum_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
 #endif
@@ -379,6 +418,9 @@
 #ifdef CONFIG_MKNOD
 	APPLET(mknod, mknod_main, _BB_DIR_BIN, _BB_SUID_NEVER)
 #endif
+#ifdef CONFIG_MKROOTFS
+	APPLET(mkrootfs, mkrootfs_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
+#endif
 #ifdef CONFIG_MKSWAP
 	APPLET(mkswap, mkswap_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
 #endif
@@ -412,6 +454,9 @@
 #ifdef CONFIG_NETSTAT
 	APPLET(netstat, netstat_main, _BB_DIR_BIN, _BB_SUID_NEVER)
 #endif
+#ifdef CONFIG_NETWORK
+	APPLET(network, network_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
+#endif
 #ifdef CONFIG_NSLOOKUP
 	APPLET(nslookup, nslookup_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
 #endif
@@ -430,6 +475,9 @@
 #ifdef CONFIG_PIDOF
 	APPLET(pidof, pidof_main, _BB_DIR_BIN, _BB_SUID_NEVER)
 #endif
+#ifdef CONFIG_PIDOFPROC
+	APPLET(pidofproc, pidofproc_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
+#endif
 #ifdef CONFIG_PING
 	APPLET(ping, ping_main, _BB_DIR_BIN, _BB_SUID_MAYBE)
 #endif
@@ -454,6 +502,12 @@
 #ifdef CONFIG_PWD
 	APPLET(pwd, pwd_main, _BB_DIR_BIN, _BB_SUID_NEVER)
 #endif
+#ifdef CONFIG_RC
+	APPLET(rc, rc_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
+#endif
+#ifdef CONFIG_RCS
+	APPLET(rcS, rcS_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
+#endif
 #ifdef CONFIG_RDATE
 	APPLET(rdate, rdate_main, _BB_DIR_USR_SBIN, _BB_SUID_NEVER)
 #endif
@@ -466,6 +520,12 @@
 #ifdef CONFIG_REBOOT
 	APPLET(reboot, reboot_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
 #endif
+#ifdef CONFIG_REMOTE_FS
+	APPLET(remote_fs, remote_fs_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
+#endif
+#ifdef CONFIG_REMOVE_INITD
+	APPLET(remove_initd, remove_initd_main, _BB_DIR_USR_SBIN, _BB_SUID_NEVER)
+#endif
 #ifdef CONFIG_RENICE
 	APPLET(renice, renice_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
 #endif
@@ -526,6 +586,9 @@
 #ifdef CONFIG_START_STOP_DAEMON
     APPLET_ODDNAME("start-stop-daemon", start_stop_daemon_main, _BB_DIR_SBIN, _BB_SUID_NEVER, start_stop_daemon)
 #endif
+#ifdef CONFIG_START_DAEMON
+	APPLET(start_daemon, start_daemon_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
+#endif
 #ifdef CONFIG_STRINGS
 	APPLET(strings, strings_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
 #endif
@@ -598,6 +661,9 @@
 #ifdef CONFIG_UDHCPC
 	APPLET(udhcpc, udhcpc_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
 #endif
+#ifdef CONFIG_UDHCPC_SCRIPT
+	APPLET(udhcpc_script, udhcpc_script_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
+#endif
 #ifdef CONFIG_UDHCPD
         APPLET(udhcpd, udhcpd_main, _BB_DIR_USR_SBIN, _BB_SUID_NEVER)
 #endif
diff -urNX busybox-1.00/runlevel/diff_excludes busybox-1.00-original/include/usage.h busybox-1.00/include/usage.h
--- busybox-1.00-original/include/usage.h	2004-09-15 02:23:56.000000000 +1000
+++ busybox-1.00/include/usage.h	2005-03-14 09:37:34.000000000 +1000
@@ -89,6 +89,43 @@
 	"$ basename /foo/bar.txt .txt\n" \
 	"bar"
 
+
+#define boot_named_trivial_usage \
+	"start | stop | restart | try-restart | reload | force-reload | status | info"
+#define boot_named_full_usage \
+	"LSB compliant named init.d script."
+#define boot_named_example_usage \
+	"$ boot_named start\n" \
+	"Start boot_named ... OK\n"
+
+
+#define boot_portmap_trivial_usage \
+	"start | stop | restart | try-restart | reload | force-reload | status | info"
+#define boot_portmap_full_usage \
+	"LSB compliant portmap init.d script."
+#define boot_portmap_example_usage \
+	"$ boot_portmap start\n" \
+	"Start boot_portmap ... OK\n"
+
+
+#define boot_syslog_trivial_usage \
+	"start | stop | restart | try-restart | reload | force-reload | status | info"
+#define boot_syslog_full_usage \
+	"LSB compliant syslog init.d script."
+#define boot_syslog_example_usage \
+	"$ boot_syslog start\n" \
+	"Start boot_syslog ... OK\n"
+
+
+#define boot_time_trivial_usage \
+	"start | stop | restart | try-restart | reload | force-reload | status | info"
+#define boot_time_full_usage \
+	"LSB compliant time init.d script."
+#define boot_time_example_usage \
+	"$ boot_time start\n" \
+	"Start boot_time ... OK\n"
+
+
 #define bunzip2_trivial_usage \
 	"[OPTION]... [FILE]"
 #define bunzip2_full_usage \
@@ -768,6 +805,23 @@
         " esac\n" \
         "done\n"
 
+
+#define getpkg_trivial_usage \
+	"[-afk] [PACKAGE] {[URL] | [DIR]}"
+#define getpkg_full_usage \
+	"Install a Trinux PACKAGE from a FILE or an URL ." \
+	"\t-a,\t\tget all packages\n" \
+	"\t-f,\t\tpackage file, no need to download\n" \
+	"\t-k,\t\tkernel package"
+#define getpkg_example_usage \
+	"$ getpkg\n" \
+	"$ getpkg -a\n" \
+	"$ getpkg -f name\n" \
+	"$ getpkg -fk name /media/cdrom/trinux/pkg\n" \
+	"$ getpkg -k name\n" \
+	"$ getpkg name http://www.trinux.org/pkg/\n"
+
+
 #define getty_trivial_usage \
 	"[OPTIONS]... baud_rate,... line [termtype]"
 #define getty_full_usage \
@@ -1299,6 +1353,15 @@
 	"\t-p\tpreserve date\n" \
 	"\t-s\tstrip symbol tables"
 
+
+#define install_initd_trivial_usage \
+	"FILE"
+#define install_initd_full_usage \
+	"LSB compliant install_initd init.d script installer."
+#define install_initd_example_usage \
+	"$ install_initd /etc/init.d/init_script\n"
+
+
 #define ip_trivial_usage \
 	"[ OPTIONS ] { address | link | route | tunnel } { COMMAND | help }"
 #define ip_full_usage \
@@ -1391,6 +1454,16 @@
 #define killall_example_usage \
 	"$ killall apache\n"
 
+#define killproc_trivial_usage \
+	"[OPTION] COMMAND [SIGNAL]"
+#define killproc_full_usage \
+	"LSB compliant killproc daemon killer." \
+	"\n\nOptions:"\
+	"\n\t-p <pid-file>\t\t\tload pid using a pid-file"
+#define killproc_example_usage \
+	"$ killproc daemon_proggy\n"
+
+
 #define klogd_trivial_usage \
 	"[-c n] [-n]"
 #define klogd_full_usage \
@@ -1407,6 +1480,14 @@
 	"$ length Hello\n" \
 	"5\n"
 
+#define linuxrc_trivial_usage \
+	""
+#define linuxrc_full_usage \
+	"linuxrc pre boot."
+#define linuxrc_example_usage \
+	"$ linuxrc\n"
+
+
 #define ln_trivial_usage \
 	"[OPTION] TARGET... LINK_NAME|DIRECTORY"
 #define ln_full_usage \
@@ -1435,6 +1516,39 @@
 #define loadkmap_example_usage \
 	"$ loadkmap < /etc/i18n/lang-keymap\n"
 
+#define local_fs_trivial_usage \
+	"start | stop | restart | try-restart | reload | force-reload | status | info"
+#define local_fs_full_usage \
+	"LSB compliant local_fs init.d script."
+#define local_fs_example_usage \
+	"$ local_fs start\n" \
+	"Start local_fs ... OK\n"
+
+
+#define log_failure_msg_trivial_usage \
+	"MESSAGE"
+#define log_failure_msg_full_usage \
+	"LSB compliant log_failure_msg."
+#define log_failure_msg_example_usage \
+	"$ log_failure_msg "It be broke!"\n"
+
+
+#define log_success_msg_trivial_usage \
+	"MESSAGE"
+#define log_success_msg_full_usage \
+	"LSB compliant log_success_msg."
+#define log_success_msg_example_usage \
+	"$ log_success_msg "It worked."\n"
+
+
+#define log_warning_msg_trivial_usage \
+	"MESSAGE"
+#define log_warning_msg_full_usage \
+	"LSB compliant log_warning_msg."
+#define log_warning_msg_example_usage \
+	"$ log_warning_msg "It might be broke."\n"
+
+
 #define logger_trivial_usage \
 	"[OPTION]... [MESSAGE]"
 #define logger_full_usage \
@@ -1570,6 +1684,14 @@
 	"# makedevs /dev/hda b 3 0 0 8 s\n" \
 	"[creates hda,hda1-hda8]\n"
 
+#define man_trivial_usage \
+	"[NAME]"
+#define man_full_usage \
+	"Show documentation for Trinux software."
+#define man_example_usage \
+	"$ man basics\n"
+
+
 #ifdef CONFIG_FEATURE_MD5_SHA1_SUM_CHECK
 #define USAGE_MD5_SHA1_SUM_CHECK(a) a
 #else
@@ -1652,6 +1774,15 @@
 	"$ mknod /dev/fd0 b 2 0\n" \
 	"$ mknod -m 644 /tmp/pipe p\n"
 
+
+#define mkrootfs_trivial_usage \
+	"[-c filename] [PATH]"
+#define mkrootfs_full_usage \
+	"Creates all the directories, devices, files, and links needed for a root file system."
+#define mkrootfs_example_usage \
+	"$ mkrootfs /\n"
+
+
 #define mkswap_trivial_usage \
 	"[-c] [-v0|-v1] device [block-count]"
 #define mkswap_full_usage \
@@ -1813,6 +1944,16 @@
 	"\t-w raw sockets\n" \
 	"\t-x unix sockets"
 
+
+#define network_trivial_usage \
+	"start | stop | restart | try-restart | reload | force-reload | status | info"
+#define network_full_usage \
+	"LSB compliant network init.d script."
+#define network_example_usage \
+	"$ network start\n" \
+	"Start network ... OK\n"
+
+
 #define nslookup_trivial_usage \
 	"[HOST] [SERVER]"
 #define nslookup_full_usage \
@@ -1875,6 +2016,16 @@
 	"$ pidof init\n" \
 	"1\n"
 
+#define pidofproc_trivial_usage \
+	"[OPTION] COMMAND"
+#define pidofproc_full_usage \
+	"LSB compliant pidofproc daemon checker." \
+	"\n\nOptions:"\
+	"\n\t-p <pid-file>\t\t\tsave or load pid using a pid-file"
+#define pidofproc_example_usage \
+	"$ pidofproc daemon_proggy\n"
+
+
 #ifndef CONFIG_FEATURE_FANCY_PING
 #define ping_trivial_usage "host"
 #define ping_full_usage    "Send ICMP ECHO_REQUEST packets to network hosts"
@@ -1977,6 +2128,33 @@
 	"$ pwd\n" \
 	"/root\n"
 
+#define rc_trivial_usage \
+	"[RUNLEVEL] | COMMAND [start | stop | restart | try-restart | reload | force-reload | status | info] [OPTIONS]"
+#define rc_full_usage \
+	"LSB compliant runlevel controller."
+#define rc_example_usage \
+	"$ rc\n" \
+	"$ rc 5\n" \
+	"$ rc network start\n" \
+	"Start network ... OK\n" \
+	"$ rc network --runlevels\n" \
+	"3 4 5\n" \
+	"$ rc network --runlevels -v\n" \
+	"The \"network\" service will be active during these runlevels :\n" \
+	"3 - multi user with network.\n" \
+	"4 - multi user with network and twin.\n" \
+	"5 - multi user with networkand X.\n" \
+	"$ rc network --runlevels 3 4 5\n"
+
+
+#define rcS_trivial_usage \
+	""
+#define rcS_full_usage \
+	"sysinit for inittab."
+#define rcS_example_usage \
+	"$ rcS\n"
+
+
 #define rdate_trivial_usage \
 	"[-sp] HOST"
 #define rdate_full_usage \
@@ -2002,6 +2180,23 @@
 	"Options:\n" \
 	"\t-d\t\tdelay interval for rebooting."
 
+#define remote_fs_trivial_usage \
+	"start | stop | restart | try-restart | reload | force-reload | status | info"
+#define remote_fs_full_usage \
+	"LSB compliant remote_fs init.d script."
+#define remote_fs_example_usage \
+	"$ remote_fs start\n" \
+	"Start remote_fs ... OK\n"
+
+
+#define remove_initd_trivial_usage \
+	"FILE"
+#define remove_initd_full_usage \
+	"LSB compliant remove_initd init.d script removal."
+#define remove_initd_example_usage \
+	"$ remove_initd /etc/init.d/init_script\n"
+
+
 #define renice_trivial_usage \
 	"priority pid [pid ...]"
 #define renice_full_usage \
@@ -2212,6 +2407,18 @@
 	"e\n" \
 	"f\n"
 
+#define start_daemon_trivial_usage \
+	"[OPTIONS]... COMMAND [ARGS...]"
+#define start_daemon_full_usage \
+	"LSB compliant start_daemon daemon starter."\
+	"\n\nOptions:"\
+	"\n\t-f\t\t\tforce a start if already running"\
+	"\n\t-n <nicelevel>\t\t\tnice level"\
+	"\n\t-p <pid-file>\t\t\tsave or load pid using a pid-file"
+#define start_daemon_example_usage \
+	"$ start_daemon -p /var/run/daemon_proggy.pid daemon_proggy --foo blah\n"
+
+
 #define start_stop_daemon_trivial_usage \
 	"[OPTIONS] [--start|--stop] ... [-- arguments...]\n"
 #define start_stop_daemon_full_usage \
@@ -2625,6 +2832,11 @@
 	"\t-s,\t--script=file\tRun file at dhcp events (default: /usr/share/udhcpc/default.script)\n" \
 	"\t-v,\t--version\tDisplay version"
 
+#define udhcpc_script_trivial_usage \
+	"[ACTION]"
+#define udhcpc_script_full_usage \
+	"Should only be called by udhcpc."
+
 #define udhcpd_trivial_usage \
 	"[configfile]\n" \
 
diff -urNX busybox-1.00/runlevel/diff_excludes busybox-1.00-original/networking/udhcp/dhcpc.h busybox-1.00/networking/udhcp/dhcpc.h
--- busybox-1.00-original/networking/udhcp/dhcpc.h	2004-01-31 09:45:12.000000000 +1000
+++ busybox-1.00/networking/udhcp/dhcpc.h	2005-03-12 04:12:30.000000000 +1000
@@ -2,7 +2,8 @@
 #ifndef _DHCPC_H
 #define _DHCPC_H
 
-#define DEFAULT_SCRIPT  "/usr/share/udhcpc/default.script"
+//#define DEFAULT_SCRIPT  "/usr/share/udhcpc/default.script"
+#define DEFAULT_SCRIPT  "/sbin/udhcpc_script"
 
 /* allow libbb_udhcp.h to redefine DEFAULT_SCRIPT */
 #include "libbb_udhcp.h"
diff -urNX busybox-1.00/runlevel/diff_excludes busybox-1.00-original/networking/udhcp/libbb_udhcp.h busybox-1.00/networking/udhcp/libbb_udhcp.h
--- busybox-1.00-original/networking/udhcp/libbb_udhcp.h	2004-05-19 19:18:04.000000000 +1000
+++ busybox-1.00/networking/udhcp/libbb_udhcp.h	2005-03-12 04:07:27.000000000 +1000
@@ -5,7 +5,8 @@
 
 #ifdef CONFIG_INSTALL_NO_USR
 #undef DEFAULT_SCRIPT
-#define DEFAULT_SCRIPT  "/share/udhcpc/default.script"
+//#define DEFAULT_SCRIPT  "/share/udhcpc/default.script"
+#define DEFAULT_SCRIPT  "/sbin/udhcpc_script"
 #endif
 
 #ifndef _LIBBB_UDHCP_H
diff -urNX busybox-1.00/runlevel/diff_excludes busybox-1.00-original/sysdeps/linux/Config.in busybox-1.00/sysdeps/linux/Config.in
--- busybox-1.00-original/sysdeps/linux/Config.in	2004-05-25 21:30:22.000000000 +1000
+++ busybox-1.00/sysdeps/linux/Config.in	2005-03-12 00:47:43.000000000 +1000
@@ -223,6 +223,8 @@
 source debianutils/Config.in
 source editors/Config.in
 source findutils/Config.in
+source my_linux/Config.in
+source runlevel/Config.in
 source init/Config.in
 source loginutils/Config.in
 source miscutils/Config.in