Masato Taruishi
taru****@sourc*****
2004年 6月 30日 (水) 01:57:55 JST
===================================================================
RCS file: demo/uml/20uml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- demo/uml/20uml 2004/06/29 12:15:26 1.1
+++ demo/uml/20uml 2004/06/29 16:57:55 1.2
@@ -27,8 +27,8 @@
UML_NAMESERVER=$(ultrapossum_getconf UML_NAMESERVER "`grep nameserver /etc/resolv.conf | awk -F' ' '{print $2;}' | head -1`")
UML_HOSTS=$(ultrapossum_getconf UML_HOSTS "$MASTER $SLAVES")
UML_USER=$(ultrapossum_getconf UML_USER "daemon")
- UML_DIST=$(ultrapossum_getconf UML_DIST "stable")
- UML_MIRROR=$(ultrapossum_getconf UML_MIRROR "")
+ UML_DIST=$(ultrapossum_getconf UML_DIST "woody")
+ UML_MIRROR=$(ultrapossum_getconf UML_MIRROR "http://http.us.debian.org/debian")
UML_PROXY=$(ultrapossum_getconf UML_PROXY "")
UML_ULTRAPOSSUM_APT=$(ultrapossum_getconf UML_APT_SOURCE "http://ultrapossum.org/debian/ ./")
UML_MEM=$(ultrapossum_getconf UML_MEM "64M")
===================================================================
RCS file: demo/uml/boot,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- demo/uml/boot 2004/06/29 12:35:27 1.2
+++ demo/uml/boot 2004/06/29 16:57:55 1.3
@@ -15,4 +15,16 @@
fi
trap "eval `ultrapossum-config term`" 0
-$MODULEDIR/uml/uml-run $1 su -c "linux ubd0=$UMLDIR/$1/hda con0=fd:0,fd:1 con=pts mem=$UML_MEM eth0=tuntap,$host_if,,$host" $UML_USER
+root=$UMLDIR/$1/hda
+
+if ! test -f "$root"; then
+ if test -f "$UMLDIR/$1/hda.0"; then
+ echo "Using rotated rootfs: hda.0" 1>&2
+ root=$UMLDIR/$1/hda.0
+ else
+ echo "rootfs not found" 1>&2
+ exit 1
+ fi
+fi
+
+$MODULEDIR/uml/uml-run $1 su -c "linux ubd0=$root con0=fd:0,fd:1 con=pts mem=$UML_MEM eth0=tuntap,$host_if,,$host" $UML_USER
===================================================================
RCS file: demo/uml/createrootfs.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- demo/uml/createrootfs.sh 2004/06/29 12:15:26 1.1
+++ demo/uml/createrootfs.sh 2004/06/29 16:57:55 1.2
@@ -28,5 +28,5 @@
cd $UMLDIR/$1
-$MODULEDIR/uml/uml-run "$1" su -c "rootstrap -u mem=$UML_MEM hda" $UML_USER
+$MODULEDIR/uml/uml-run "$1" su -c "rootstrap -u mem=$UML_MEM hda" $UML_USER || ( savelog $UMLDIR/$1/hda; exit 1 )
===================================================================
RCS file: demo/uml/ultrapossum,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- demo/uml/ultrapossum 2004/06/29 12:15:26 1.1
+++ demo/uml/ultrapossum 2004/06/29 16:57:55 1.2
@@ -5,5 +5,5 @@
cp -a /tmp/host/etc/ultrapossum $TARGET/etc/ultrapossum
echo "deb $ultrapossum_apt" >> $TARGET/etc/apt/sources.list
-chroot $TARGET /bin/sh -c "apt-get update; apt-get -y -o DPkg::Options::="--force-confold" -f install $ultrapossum_packages"
-
+chroot $TARGET mount -t proc proc /proc
+chroot $TARGET /bin/sh -c "apt-get update; apt-get -y -o DPkg::Options::="--force-confold" -f install $ultrapossum_packages; run-parts --arg=stop /etc/init.d/"