[Pkg-uml-commit] r92 - in trunk/src/rootstrap: . modules

[Mattia Dongili]

Author: malattia
Date: 2006-05-23 20:17:11 +0000 (Tue, 23 May 2006)
New Revision: 92

Modified:
   trunk/src/rootstrap/builder
   trunk/src/rootstrap/modules/debian
   trunk/src/rootstrap/modules/uml
Log:
revert r91 unrelated changes

Modified: trunk/src/rootstrap/builder
===================================================================
--- trunk/src/rootstrap/builder	2006-05-23 20:10:29 UTC (rev 91)
+++ trunk/src/rootstrap/builder	2006-05-23 20:17:11 UTC (rev 92)
@@ -44,8 +44,7 @@
             print "Using rootstrap module %s from:\n\t%s" % (module,script)
             status = os.spawnle(os.P_WAIT, script, script, vars)
             if status != 0:
-	        if "debug" in vars and vars["debug"] == "true":
-		    status = os.spawnle(os.P_WAIT, "/bin/sh", "/bin/sh", vars)
+		os.system("/bin/sh")
                 raise "rootstrap: Module '%s' failed, status: %d" % (module,status)
             return
 

Modified: trunk/src/rootstrap/modules/debian
===================================================================
--- trunk/src/rootstrap/modules/debian	2006-05-23 20:10:29 UTC (rev 91)
+++ trunk/src/rootstrap/modules/debian	2006-05-23 20:17:11 UTC (rev 92)
@@ -33,7 +33,7 @@
     opts="$opts --unpack-tarball $basedebs"
 fi
 
-echo "debootstrap $opts $dist $TARGET $mirror $script"
+echo "debootstrapping with the following opt: '$opts' for '$dist' on target '$TARGET' using mirror '$mirror' $script"
 debootstrap $opts $dist $TARGET $mirror $script
 
 echo "deb $mirror $dist main" > $TARGET/etc/apt/sources.list

Modified: trunk/src/rootstrap/modules/uml
===================================================================
--- trunk/src/rootstrap/modules/uml	2006-05-23 20:10:29 UTC (rev 91)
+++ trunk/src/rootstrap/modules/uml	2006-05-23 20:17:11 UTC (rev 92)
@@ -5,11 +5,12 @@
 	mknod $TARGET/dev/ubd$i b 98 $[$i * 16]; 
 done
 
-# create generic device nodes.
-mount -t proc proc $TARGET/proc
-chroot $TARGET /bin/sh -c 'cd /dev && ./MAKEDEV generic'
+# Make bootable without DevFS on guest
+# mknod $TARGET/dev/ubd0 b 98 0 instead of /dev/ubd/0
+#for i in 0 1 2 3 4 5 6 7; do mknod $TARGET/dev/ubd$i b 98 $[$i * 16]; done
 
-# generate a new fstab
+#chroot $TARGET /bin/sh -c 'cd /dev && ./MAKEDEV ubd'
+
 cat <<EOF > $TARGET/etc/fstab
 /dev/ubd0 / 	$fstype defaults 			0 1
 proc 	/proc 	proc 	defaults 			0 0