7 files changed, 4 insertions, 60 deletions
diff --git a/data/system-cmds/_metadata/depends b/data/system-cmds/_metadata/depends
new file mode 100644
index 000000000..6d2b9aadd
--- /dev/null
+++ b/data/system-cmds/_metadata/depends
@@ -0,0 +1 @@
+firmware-sbin
diff --git a/data/system-cmds/_metadata/priority b/data/system-cmds/_metadata/priority
index d0b3ce728..fad9e164a 100644
--- a/data/system-cmds/_metadata/priority
+++ b/data/system-cmds/_metadata/priority
@@ -1 +1 @@
-+required
+required
diff --git a/data/system-cmds/make.sh b/data/system-cmds/make.sh
index b82d2e403..17a3f9c71 100644
--- a/data/system-cmds/make.sh
+++ b/data/system-cmds/make.sh
@@ -21,7 +21,7 @@ cd ..
 
 cp -va "${PKG_DATA}"/kextmanager* .
 # XXX: kvm_mkdb shutdown
-for tproj in ac accton chpass dynamic_pager getconf getty hostinfo iostat login mkfile nvram pwd_mkdb reboot sync update vifs vipw vm_stat zdump zic zprint; do
+for tproj in ac accton dynamic_pager getconf getty hostinfo iostat login mkfile pwd_mkdb reboot sync update vifs vipw vm_stat zdump zic zprint; do
     cflags=
 
     case ${tproj} in
@@ -50,4 +50,4 @@ pkg: ln -s reboot /sbin/halt
 pkg: cp -a arch getconf getty hostinfo login passwd vm_stat zprint /usr/bin
 pkg: ln -s chpass /usr/bin/chfn
 pkg: ln -s chpass /usr/bin/chsh
-pkg: cp -a ac accton iostat mkfile nvram pwd_mkdb sysctl update vifs vipw zdump zic /usr/sbin
+pkg: cp -a ac accton iostat mkfile pwd_mkdb sysctl update vifs vipw zdump zic /usr/sbin
diff --git a/data/system-cmds/reboot.diff b/data/system-cmds/reboot.diff
deleted file mode 100644
index 4c9dc152d..000000000
--- a/data/system-cmds/reboot.diff
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -ru system_cmds-431/reboot.tproj/reboot.c system_cmds-431+iPhone/reboot.tproj/reboot.c
---- system_cmds-431/reboot.tproj/reboot.c	2007-09-06 20:46:17.000000000 +0000
-+++ system_cmds-431+iPhone/reboot.tproj/reboot.c	2008-03-30 20:43:53.000000000 +0000
-@@ -63,7 +63,6 @@
- #include <mach/mach_port.h>		// allocate
- #include <mach/mach.h>			// task_self, etc
- #include <servers/bootstrap.h>	// bootstrap
--#include <reboot2.h>
- #endif
- 
- void usage(void);
-@@ -81,11 +80,9 @@
- 	int ch, howto, kflag, lflag, nflag, qflag, uflag;
- 	char *p;
- 	const char *user;
--#ifndef __APPLE__
- 	int i, fd, pflag, sverrno;
- 	u_int pageins;
- 	char *kernel;
--#endif
- 
- 	if (strstr((p = rindex(*argv, '/')) ? p + 1 : *argv, "halt")) {
- 		dohalt = 1;
-@@ -240,19 +237,16 @@
- 	}
- #endif
- 
--#ifdef __APPLE__
--	// launchd(8) handles reboot.  This call returns NULL on success.
--	exit(reboot2(howto) == NULL ? EXIT_SUCCESS : EXIT_FAILURE);
--#else /* __APPLE__ */
- 	reboot(howto);
- 	/* FALLTHROUGH */
- 
-+#ifndef __APPLE__
- restart:
-+#endif
- 	sverrno = errno;
- 	errx(1, "%s%s", kill(1, SIGHUP) == -1 ? "(can't restart init): " : "",
- 	    strerror(sverrno));
- 	/* NOTREACHED */
--#endif /* __APPLE__ */
- }
- 
- void
diff --git a/data/system-cmds/shutdown.diff b/data/system-cmds/shutdown.diff
deleted file mode 100644
index 8526c7534..000000000
--- a/data/system-cmds/shutdown.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -r -u system_cmds-431/shutdown.tproj/shutdown.c system_cmds-431+iPhone/shutdown.tproj/shutdown.c
---- system_cmds-431/shutdown.tproj/shutdown.c	2007-09-06 21:59:26.000000000 +0000
-+++ system_cmds-431+iPhone/shutdown.tproj/shutdown.c	2008-02-25 22:30:51.000000000 +0000
-@@ -471,7 +471,7 @@
- 		if (nosync) howto |= RB_NOSYNC;
- 
- 		// launchd(8) handles reboot.  This call returns NULL on success.
--		exit(reboot2(howto) == NULL ? EXIT_SUCCESS : EXIT_FAILURE);
-+                reboot(howto);
- 	}
- 	/* NOT-REACHED */
- 
diff --git a/data/system-cmds/system_cmds-433.4.tar.gz b/data/system-cmds/system_cmds-433.4.tar.gz
new file mode 100644
index 000000000..16699b6ac
--- /dev/null
+++ b/data/system-cmds/system_cmds-433.4.tar.gz
diff --git a/data/system-cmds/system_cmds-433.8.tar.gz b/data/system-cmds/system_cmds-433.8.tar.gz
deleted file mode 100644
index 50b66cce0..000000000
--- a/data/system-cmds/system_cmds-433.8.tar.gz
+++ /dev/null