Masato Taruishi
taru****@sourc*****
2004年 6月 30日 (水) 18:15:16 JST
===================================================================
RCS file: demo/uml/boot,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- demo/uml/boot 2004/06/29 16:57:55 1.3
+++ demo/uml/boot 2004/06/30 09:15:15 1.4
@@ -22,8 +22,7 @@
echo "Using rotated rootfs: hda.0" 1>&2
root=$UMLDIR/$1/hda.0
else
- echo "rootfs not found" 1>&2
- exit 1
+ $MODULEDIR/uml/createrootfs.sh $1
fi
fi
===================================================================
RCS file: demo/uml/rootstrap.conf.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- demo/uml/rootstrap.conf.in 2004/06/29 12:15:26 1.1
+++ demo/uml/rootstrap.conf.in 2004/06/30 09:15:16 1.2
@@ -116,4 +116,5 @@
[ultrapossum]
ultrapossum_apt=#UML_ULTRAPOSSUM_APT#
ultrapossum_packages=#ULTRAPOSSUM_PACKAGES#
+ultrapossum_hosts=#ULTRAPOSSUM_HOSTS#
===================================================================
RCS file: demo/uml/rootstrap.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- demo/uml/rootstrap.sh 2004/06/29 12:15:26 1.1
+++ demo/uml/rootstrap.sh 2004/06/30 09:15:16 1.2
@@ -19,5 +19,6 @@
-e "s/#UML_NAMESERVER#/$UML_NAMESERVER/" \
-e "s!#UML_ULTRAPOSSUM_APT#!$UML_ULTRAPOSSUM_APT!" \
-e "s/#ULTRAPOSSUM_PACKAGES#/$ultrapossum_packages/" \
+ -e "s!#ULTRAPOSSUM_HOSTS#!$UMLDIR/hosts!" \
< $UML_ROOTSTRAP_CONF_IN
===================================================================
RCS file: demo/uml/ultrapossum,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- demo/uml/ultrapossum 2004/06/29 16:57:55 1.2
+++ demo/uml/ultrapossum 2004/06/30 09:15:16 1.3
@@ -6,4 +6,5 @@
cp -a /tmp/host/etc/ultrapossum $TARGET/etc/ultrapossum
echo "deb $ultrapossum_apt" >> $TARGET/etc/apt/sources.list
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/"
+cat /tmp/host/$ultrapossum_hosts >> $TARGET/etc/hosts
+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/"
===================================================================
RCS file: demo/uml/update-uml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- demo/uml/update-uml 2004/06/30 01:25:57 1.2
+++ demo/uml/update-uml 2004/06/30 09:15:16 1.3
@@ -27,16 +27,20 @@
configure() {
progress "Configuring User-Mode-Linux... "
+ /bin/cp /dev/null $UMLDIR/hosts
for h in $UML_HOSTS
do
+ eval "`$MODULEDIR/uml/map $h`"
install -d $UMLDIR/$h
$MODULEDIR/uml/rootstrap.sh $h > $UMLDIR/$h/rootstrap.conf
+ echo "$host $h" >> $UMLDIR/hosts
done
chown -R $UML_USER $UMLDIR/
progress "Configuring User-Mode-Linux... done"
}
remove() {
+ /bin/rm -f $UMLDIR/hosts
for h in $UML_HOSTS
do
/bin/rm -f $UMLDIR/$h/rootstrap.conf