# HG changeset patch
# User Rob Landley <rob@landley.net>
# Date 1231991006 21600
# Node ID 965923c576f3f9c2cd370287dc799580f038888d
# Parent  b942381f185595bf3f66f6874f37f14a0bf4ddb5
More initramfs fixes.  Still doesn't work yet.

I pine for a working User Mode Linux where I can stick printfs() into the
source code that output something even when the system isn't managing to
set up /dev/console properly.  (Sticking in printk() when you're getting no
output isn't very useful.)

diff -r b942381f1855 -r 965923c576f3 system-image.sh
--- a/system-image.sh	Wed Jan 14 02:42:17 2009 -0600
+++ b/system-image.sh	Wed Jan 14 21:43:26 2009 -0600
@@ -48,19 +48,16 @@
 if [ "$SYSIMAGE_TYPE" == "initramfs" ]
 then
   echo "Generating initramfs (in background)"
-  (
-    $CC usr/gen_init_cpio.c -o my_gen_init_cpio || dienow
-    (./my_gen_init_cpio <(
-        [ ! -d "$NATIVE"/dev ] && echo "dir /dev 755 0 0"
-        [ ! -e "$NATIVE"/init ] &&
-          echo "slink /init $NATIVE/$TOOLSDIR/sbin/init.sh 755 0 0"
-
-        "$SOURCES"/toys/gen_initramfs_list.sh "$NATIVE" &&
-        echo "nod /dev/console 640 0 0 c 5 1" >> initramfs.txt || dienow
-      ) || dienow
-    ) | gzip -9 > initramfs_data.cpio.gz || dienow
-    echo Initramfs generated.
-  ) &
+  $CC usr/gen_init_cpio.c -o my_gen_init_cpio || dienow
+  (./my_gen_init_cpio <(
+      "$SOURCES"/toys/gen_initramfs_list.sh "$NATIVE"
+      [ ! -e "$NATIVE"/init ] &&
+        echo "slink /init /bin/hello 755 0 0" # /$TOOLSDIR/sbin/init.sh 755 0 0"
+      [ ! -d "$NATIVE"/dev ] && echo "dir /dev 755 0 0"
+      echo "nod /dev/console 640 0 0 c 5 1"
+    ) || dienow
+  ) | gzip -9 > initramfs_data.cpio.gz || dienow
+  echo Initramfs generated.
 
   # Wait for initial kernel build to finish.
 
@@ -137,7 +134,7 @@
   fi
 
   echo "-nographic -no-reboot -kernel \"$2\" \$WITH_HDB $HDA" \
-    "-append \"${APPEND}panic=1 PATH=\$DISTCC_PATH_PREFIX/\$TOOLSDIR/bin" \
+    "-append \"${APPEND}panic=1 PATH=\$DISTCC_PATH_PREFIX/$TOOLSDIR/bin" \
     '$KERNEL_EXTRA"'
 }