[Pkg-uml-commit] r81 - in trunk/src/rootstrap: . debian modules
Stefano Melchior
stex-guest at costa.debian.org
Sun May 21 22:38:54 UTC 2006
Author: stex-guest
Date: 2006-05-21 22:38:53 +0000 (Sun, 21 May 2006)
New Revision: 81
Modified:
trunk/src/rootstrap/COPYING
trunk/src/rootstrap/debian/changelog
trunk/src/rootstrap/debian/control
trunk/src/rootstrap/debian/copyright
trunk/src/rootstrap/debian/rules
trunk/src/rootstrap/modules/debian
trunk/src/rootstrap/modules/uml
trunk/src/rootstrap/rootstrap
trunk/src/rootstrap/rootstrap.sgml
Log:
Modified: trunk/src/rootstrap/COPYING
===================================================================
--- trunk/src/rootstrap/COPYING 2006-05-21 20:49:14 UTC (rev 80)
+++ trunk/src/rootstrap/COPYING 2006-05-21 22:38:53 UTC (rev 81)
@@ -2,7 +2,7 @@
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Modified: trunk/src/rootstrap/debian/changelog
===================================================================
--- trunk/src/rootstrap/debian/changelog 2006-05-21 20:49:14 UTC (rev 80)
+++ trunk/src/rootstrap/debian/changelog 2006-05-21 22:38:53 UTC (rev 81)
@@ -1,3 +1,15 @@
+rootstrap (0.3.21-2) unstable; urgency=low
+
+ * fixed issue for 2.6 kernel for ubd device (Closes: #272914), (closes: #282914)
+ * fixed Standards depedance changes
+ * fixed user-mode-linux dependancy (Closes: #275410)
+ * fixed udb missing (Closes: #342694)
+ * uml-utilities fix assures network to work with u-m-l 2.6 serie (Closes: #304461)
+ * fixed issue with more recent version of u-m-l (Closes: #320410)
+ * add reference of the hostfs need on man page (Closes: #300221)
+
+ -- Stefano Melchior <stefano.melchior at openlabs.it> Sun, 21 May 2006 23:19:38 +0200
+
rootstrap (0.3.21-1) unstable; urgency=low
* If there are no processes left running which use the target
Modified: trunk/src/rootstrap/debian/control
===================================================================
--- trunk/src/rootstrap/debian/control 2006-05-21 20:49:14 UTC (rev 80)
+++ trunk/src/rootstrap/debian/control 2006-05-21 22:38:53 UTC (rev 81)
@@ -1,13 +1,14 @@
Source: rootstrap
Section: utils
Priority: optional
-Maintainer: Matt Zimmerman <mdz at debian.org>
-Build-Depends: debhelper (>> 3.0.0), docbook-to-man
-Standards-Version: 3.5.2
+Maintainer: Debian UML Team <pkg-uml-pkgs at lists.alioth.debian.org>
+Uploaders: Andreas Schuldei <andreas at schuldei.org>, Mattia Dongili <malattia at debian.org>, Stefano Melchior <stefano.melchior at openlabs.it>
+Build-Depends: debhelper (>> 4.0.0), docbook-to-man
+Standards-Version: 3.7.2
Package: rootstrap
Architecture: i386
-Depends: python, user-mode-linux (>= 2.4.20-4um-1), debootstrap (>= 0.1.16.4), dpkg (>= 1.9.19)
+Depends: python, debootstrap (>= 0.1.16.4), dpkg (>= 1.9.19), user-mode-linux
Recommends: uml-utilities
Suggests: dhcp3-client, dhcp3-server
Description: A tool for building complete Linux filesystem images
Modified: trunk/src/rootstrap/debian/copyright
===================================================================
--- trunk/src/rootstrap/debian/copyright 2006-05-21 20:49:14 UTC (rev 80)
+++ trunk/src/rootstrap/debian/copyright 2006-05-21 22:38:53 UTC (rev 81)
@@ -23,7 +23,8 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA
+ 02110-1301 USA
On Debian systems, a copy of the GPL may be found in
/usr/share/common-licenses/GPL.
Modified: trunk/src/rootstrap/debian/rules
===================================================================
--- trunk/src/rootstrap/debian/rules 2006-05-21 20:49:14 UTC (rev 80)
+++ trunk/src/rootstrap/debian/rules 2006-05-21 22:38:53 UTC (rev 81)
@@ -6,7 +6,7 @@
#export DH_VERBOSE=1
# This is the debhelper compatability version to use.
-export DH_COMPAT=3
+export DH_COMPAT=4
configure: configure-stamp
configure-stamp:
Modified: trunk/src/rootstrap/modules/debian
===================================================================
--- trunk/src/rootstrap/modules/debian 2006-05-21 20:49:14 UTC (rev 80)
+++ trunk/src/rootstrap/modules/debian 2006-05-21 22:38:53 UTC (rev 81)
@@ -82,9 +82,11 @@
address $address
netmask $netmask
up route add -net 0.0.0.0 dev $interface
- up route add -net 0.0.0.0 gw $gateway
EOF
fi
+ if [ -n "$gateway" ]; then
+ echo "up route add -net 0.0.0.0 gw $gateway" >> $TARGET/etc/network/interfaces
+ fi
if [ ! -e $TARGET/etc/resolv.conf ]; then
if [ -n "$domain" ]; then
cat <<EOF >> $TARGET/etc/resolv.conf
Modified: trunk/src/rootstrap/modules/uml
===================================================================
--- trunk/src/rootstrap/modules/uml 2006-05-21 20:49:14 UTC (rev 80)
+++ trunk/src/rootstrap/modules/uml 2006-05-21 22:38:53 UTC (rev 81)
@@ -2,9 +2,11 @@
# Add ubd devices on host (if not present)
-if [ ! -d /dev/ubd || -e /dev/ubd$i ]; then
+if [ ! -d /dev/ubd ]; then
for i in 0 1 2 3 4 5 6 7; do
- mknod $TARGET/dev/ubd$i b 98 $[$i * 16];
+ if [ -e /dev/ubd$i ]; then
+ mknod $TARGET/dev/ubd$i b 98 $[$i * 16];
+ fi
done
fi
Modified: trunk/src/rootstrap/rootstrap
===================================================================
--- trunk/src/rootstrap/rootstrap 2006-05-21 20:49:14 UTC (rev 80)
+++ trunk/src/rootstrap/rootstrap 2006-05-21 22:38:53 UTC (rev 81)
@@ -91,13 +91,13 @@
umlargs.extend(umlargs_extra)
umlargs.extend(['con0=fd:0,fd:1',
- 'con=pty',
+ 'con=pts',
'root=/dev/root',
'rootflags=/',
'rootfstype=hostfs',
'ubd1=' + imagefile,
'init=/usr/lib/rootstrap/builder',
- 'devfs=mount',
+ 'devfs=nomount',
'rsworkdir=' + os.getcwd()])
if config.has_option('global', 'umlargs'):
umlargs.extend(config.get('global', 'umlargs').split())
Modified: trunk/src/rootstrap/rootstrap.sgml
===================================================================
--- trunk/src/rootstrap/rootstrap.sgml 2006-05-21 20:49:14 UTC (rev 80)
+++ trunk/src/rootstrap/rootstrap.sgml 2006-05-21 22:38:53 UTC (rev 81)
@@ -389,6 +389,31 @@
rootstrap is run is available as $WORKDIR. The environment is
generated from the configuration file as described above.
</para>
+
+ <para>
+ Since you launch rootstrap and you invoke <command>linux</command>
+ command, you need to use the $TARGET on the host filesystem.
+ This means that <command>linux</command> needs a shared filesystem to
+ work with and to create the final result, the filesystem image
+ itself.
+ </para>
+
+ <para>
+ This is indeed the case of the /tmp/, /tmp/host, /tmp/target
+ ($TARGET) as well as /etc/rootstrap ($WORKDIR) in case you need to read the system wide
+ rootstrap.conf. These directories are needed by the
+ <command>builder</command> python script invoked by rootstrap
+ (init=/usr/lib/rootstrap/builder).
+ </para>
+
+ <para>
+ User Mode Linux kernel, <command>linux</command>, is allowed to share
+ the host filesystem, once is mounted as hostfs in its
+ /etc/fstab, thus the rootstrap idea of building a filesystem
+ image is mainly based on this feature. This means that you can
+ share the host resources and build filesystem on it, as well as
+ to share host binaries to perform whatever task you may need.
+ </para>
</refsect2>
</refsect1>
More information about the Pkg-uml-commit
mailing list