# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1273623272 -7200
# Node ID 6adfbd9871dec5d9dd54aaf3fec517ae5dd418b7
# Parent  469573f6d7d8e8cadf7d49cdb1e3375679749f75
Fixed UML device initialisation and inittab manipulation.

diff -r 469573f6d7d8 -r 6adfbd9871de README.txt
--- a/README.txt	Thu Apr 15 00:44:21 2010 +0200
+++ b/README.txt	Wed May 12 02:14:32 2010 +0200
@@ -231,7 +231,7 @@
 Again, as a privileged user, these images are then populated with the package
 manager contents as follows:
 
-uml-postsetupfs
+sudo uml-postsetupfs
 
 NOTE: Add Linux build process.
 
diff -r 469573f6d7d8 -r 6adfbd9871de uml-postsetupfs
--- a/uml-postsetupfs	Thu Apr 15 00:44:21 2010 +0200
+++ b/uml-postsetupfs	Wed May 12 02:14:32 2010 +0200
@@ -30,15 +30,15 @@
         mkdir $IMAGEDIR
 fi
 
+echo "Initialising device files..."
+chroot $PACKAGEROOT /bin/bash -c 'mount -t proc proc /proc; cd /dev; ./MAKEDEV generic; umount /proc'
+
 echo "Accessing the image..."
 mount -o loop $IMAGE $IMAGEDIR || exit 1
 
 echo "Copying the filesystem into the image..."
 cp -a $PACKAGEROOT/* $IMAGEDIR
 
-echo "Initialising device files..."
-chroot $PACKAGEROOT /bin/bash -c 'mount -t proc proc /proc; cd /dev; MAKEDEV generic; umount /proc'
-
 echo "Unmounting the image..."
 umount $IMAGEDIR
 rmdir $IMAGEDIR
diff -r 469573f6d7d8 -r 6adfbd9871de user-to-uml
--- a/user-to-uml	Thu Apr 15 00:44:21 2010 +0200
+++ b/user-to-uml	Wed May 12 02:14:32 2010 +0200
@@ -17,6 +17,8 @@
         mkdir $PACKAGEROOT/dev
 fi
 
+cp /dev/MAKEDEV $PACKAGEROOT/dev
+
 echo "Removing any linked /proc entry..."
 if [ -h "$PACKAGEROOT/proc" ]; then
         rm $PACKAGEROOT/proc
@@ -35,7 +37,7 @@
 echo "Reconfiguring the console settings..."
 if [ ! -e "$PACKAGEROOT/etc/inittab.orig" ]; then
         cp $PACKAGEROOT/etc/inittab $PACKAGEROOT/etc/inittab.orig
-        grep -v "getty" $PACKAGEROOT/etc/inittab.save > $PACKAGEROOT/etc/inittab
+        grep -v "getty" $PACKAGEROOT/etc/inittab.orig > $PACKAGEROOT/etc/inittab
         echo "# We launch just one console for UML:" >> $PACKAGEROOT/etc/inittab
         echo "c0:1235:respawn:/sbin/getty 38400 tty0 linux" >> $PACKAGEROOT/etc/inittab