From c40c43c1a79000ee28ad2ce3076f7fa07be2ef57 Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <wayo.cavazos@gmail.com>
Date: Wed, 5 Dec 2007 19:35:19 -0600
Subject: [PATCH] Raptor updates

---
 extra/raptor/cronjobs.factor          | 40 ++++++++++++---------------
 extra/raptor/raptor.factor            |  4 ++-
 extra/raptor/{readme-0.1.1 => readme} |  8 ++++++
 3 files changed, 29 insertions(+), 23 deletions(-)
 rename extra/raptor/{readme-0.1.1 => readme} (94%)

diff --git a/extra/raptor/cronjobs.factor b/extra/raptor/cronjobs.factor
index 91263a31d9..684fecc6b8 100644
--- a/extra/raptor/cronjobs.factor
+++ b/extra/raptor/cronjobs.factor
@@ -6,33 +6,29 @@ IN: raptor
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: run-script ( path -- ) 1array [ fork-exec-args-wait ] curry in-thread ;
-
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
 [
-    "/etc/cron.daily/apt"             run-script
-    "/etc/cron.daily/aptitude"	      run-script
-    "/etc/cron.daily/bsdmainutils"    run-script
-    "/etc/cron.daily/find.notslocate" run-script
-    "/etc/cron.daily/logrotate"	      run-script
-    "/etc/cron.daily/man-db"	      run-script
-    "/etc/cron.daily/ntp-server"      run-script
-    "/etc/cron.daily/slocate"	      run-script
-    "/etc/cron.daily/standard"	      run-script
-    "/etc/cron.daily/sysklogd"	      run-script
-    "/etc/cron.daily/tetex-bin"	      run-script
+    "/etc/cron.daily/apt"             fork-exec-arg
+    "/etc/cron.daily/aptitude"	      fork-exec-arg
+    "/etc/cron.daily/bsdmainutils"    fork-exec-arg
+    "/etc/cron.daily/find.notslocate" fork-exec-arg
+    "/etc/cron.daily/logrotate"	      fork-exec-arg
+    "/etc/cron.daily/man-db"	      fork-exec-arg
+    "/etc/cron.daily/ntp-server"      fork-exec-arg
+    "/etc/cron.daily/slocate"	      fork-exec-arg
+    "/etc/cron.daily/standard"	      fork-exec-arg
+    "/etc/cron.daily/sysklogd"	      fork-exec-arg
+    "/etc/cron.daily/tetex-bin"	      fork-exec-arg
 ] cron-jobs-daily set-global
     
 [
-  "/etc/cron.weekly/cvs"                run-script
-  "/etc/cron.weekly/man-db"		run-script
-  "/etc/cron.weekly/ntp-server"		run-script
-  "/etc/cron.weekly/popularity-contest" run-script
-  "/etc/cron.weekly/sysklogd"		run-script
+  "/etc/cron.weekly/cvs"                fork-exec-arg
+  "/etc/cron.weekly/man-db"		fork-exec-arg
+  "/etc/cron.weekly/ntp-server"		fork-exec-arg
+  "/etc/cron.weekly/popularity-contest" fork-exec-arg
+  "/etc/cron.weekly/sysklogd"		fork-exec-arg
 ] cron-jobs-weekly set-global
 
 [
-  "/etc/cron.monthly/scrollkeeper" run-script
-  "/etc/cron.monthly/standard"     run-script
+  "/etc/cron.monthly/scrollkeeper" fork-exec-arg
+  "/etc/cron.monthly/standard"     fork-exec-arg
 ] cron-jobs-monthly set-global
\ No newline at end of file
diff --git a/extra/raptor/raptor.factor b/extra/raptor/raptor.factor
index ef5359c313..d776739d89 100644
--- a/extra/raptor/raptor.factor
+++ b/extra/raptor/raptor.factor
@@ -1,5 +1,5 @@
 
-USING: kernel parser namespaces threads sequences unix unix.process
+USING: kernel parser namespaces threads arrays sequences unix unix.process
        combinators.cleave bake ;
 
 IN: raptor
@@ -24,6 +24,8 @@ SYMBOL: networking-hook
 
 : fork-exec-args-wait ( args -- ) [ first ] [ ] bi fork-exec-wait ;
 
+: fork-exec-arg ( arg -- ) 1array [ fork-exec-args-wait ] curry in-thread ;
+
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 : forever ( quot -- ) [ call ] [ forever ] bi ;
diff --git a/extra/raptor/readme-0.1.1 b/extra/raptor/readme
similarity index 94%
rename from extra/raptor/readme-0.1.1
rename to extra/raptor/readme
index bb5d4c0ff8..dfb6890cda 100644
--- a/extra/raptor/readme-0.1.1
+++ b/extra/raptor/readme
@@ -32,6 +32,12 @@ another Linux distribution.
 
   # cp -v /scratch/factor/factor.image /sbin/init.image
 
+*** Filesystems ***
+
+  # emacs /etc/raptor/config.factor
+
+Edit the root-device and swap-devices variables.
+
 *** Static IP networking ***
 
 If you use a static IP in your network then Factor can take care of
@@ -71,6 +77,8 @@ The items in boot-hook correspond to the things in '/etc/rcS.d' and
 example, I removed the printer services. I also removed other things
 that I didn't feel were necessary on my system.
 
+Look for the line with the call to 'set-hostname' and edit it appropriately.
+
 *** Grub ***
 
 Edit your '/boot/grub/menu.lst'. Basically, copy and paste your