Remove NFS support - we will probably use FTP instead.

diff --git a/README b/README
index 0cf9c4f..3e4da74 100644 (file)
--- a/README
+++ b/README
@@ -13,8 +13,7 @@ schemes, qcow, qcow2, vmdk.
 
 Libguestfs provides ways to enumerate guest storage (eg. partitions,
 LVs, what filesystem is in each LV, etc.).  It can also run commands
 
 Libguestfs provides ways to enumerate guest storage (eg. partitions,
 LVs, what filesystem is in each LV, etc.).  It can also run commands

-in the context of the guest.  Also you can mount guest filesystems on
-the host (requires root privs and NFS).
+in the context of the guest.  Also you can access filesystems over FTP.

 
 Libguestfs is a library that can be linked with C and C++ management
 programs (or management programs written in other languages, if people
 
 Libguestfs is a library that can be linked with C and C++ management
 programs (or management programs written in other languages, if people


@@ -74,7 +73,7 @@ Notes on cross-architecture support
 
 At the moment we basically don't support cross-architecture or
 32-on-64.  This limits what is possible for some guests.  Filesystem
 
 At the moment we basically don't support cross-architecture or
 32-on-64.  This limits what is possible for some guests.  Filesystem

-operations and NFS export will work fine, but running commands in
+operations and FTP export will work fine, but running commands in

 guests may not be possible.
 
 To enable this requires work for cross-architecture and 32-on-64
 guests may not be possible.
 
 To enable this requires work for cross-architecture and 32-on-64


@@ -98,6 +97,13 @@ choose a Fedora mirror which is close to you, set this with
 './configure --with-mirror=[...]', and then proxy the whole lot
 through squid by setting http_proxy environment variable).
 
 './configure --with-mirror=[...]', and then proxy the whole lot
 through squid by setting http_proxy environment variable).
 

+You will also need to substantially increase the squid configuration
+limits:
+http://fedoraproject.org/wiki/Using_Mock_to_test_package_builds#Using_Squid_to_Speed_Up_Mock_package_downloads
+
+IntelligentMirror is another possibility, although I couldn't get it
+to work for me.
+

 
 Copyright and license information
 ----------------------------------------------------------------------
 
 Copyright and license information
 ----------------------------------------------------------------------

diff --git a/make-initramfs.sh.in b/make-initramfs.sh.in
index ccbb86a..60e2ee2 100755 (executable)
--- a/make-initramfs.sh.in
+++ b/make-initramfs.sh.in
@@ -25,7 +25,7 @@ set -e
 # larger.
 debug=yes
 
 # larger.
 debug=yes
 

-modules="-i kernel -i bash -i coreutils -i lvm2 -i ntfs-3g -i nfs-utils -i util-linux-ng -i MAKEDEV -i net-tools"
+modules="-i kernel -i bash -i coreutils -i lvm2 -i ntfs-3g -i util-linux-ng -i MAKEDEV -i net-tools"

 
 if [ "x$debug" = "xyes" ]; then
     modules="$modules -i module-init-tools -i procps -i strace -i iputils"
 
 if [ "x$debug" = "xyes" ]; then
     modules="$modules -i module-init-tools -i procps -i strace -i iputils"


@@ -40,6 +40,22 @@ rm -f $koutput
 # Create the basic initramfs.
 @FEBOOTSTRAP@ $modules @REPO@ initramfs @MIRROR@
 
 # Create the basic initramfs.
 @FEBOOTSTRAP@ $modules @REPO@ initramfs @MIRROR@
 

+# Make a safe 'install_file' function to install files into the
+# filesystem.  XXX We need a 'febootstrap-install' utility.
+# Usage: install_file <local-file> <target-pathname> mode owner[.group]
+install_file ()
+{
+    cp "$1" initramfs/"$2"
+    # Get the inode of the new file and remove it from fakeroot.log.
+    ino=$(ls -i initramfs/"$2" | awk '{print $1}')
+    cp initramfs/fakeroot.log fakeroot.log.old
+    grep -v "ino=$ino," fakeroot.log.old > initramfs/fakeroot.log
+    rm fakeroot.log.old
+    # Set mode, owner and group as desired.
+    @FEBOOTSTRAP_RUN@ initramfs -- chmod "$3" "$2"
+    @FEBOOTSTRAP_RUN@ initramfs -- chown "$4" "$2"
+}
+

 # Nuke some stuff.  The kernel pulls mkinitrd and plymouth which pulls in
 # all of Python.  Sheez.
 find initramfs -name '*plymouth*' -print0 | xargs -0 rm -rf
 # Nuke some stuff.  The kernel pulls mkinitrd and plymouth which pulls in
 # all of Python.  Sheez.
 find initramfs -name '*plymouth*' -print0 | xargs -0 rm -rf


@@ -47,7 +63,6 @@ find initramfs -name '*python*' -print0 | xargs -0 rm -rf
 
 # Modules take up nearly half of the image.  It's a rough guess that
 # we don't need any drivers (which take up most of the space).
 
 # Modules take up nearly half of the image.  It's a rough guess that
 # we don't need any drivers (which take up most of the space).

-# (We need to keep kernel/net/sunrpc for NFS)

 #rm -rf initramfs/lib/modules/*/kernel/{drivers,sound}
 rm -rf initramfs/lib/modules/*/kernel/arch/x86/kvm
 
 #rm -rf initramfs/lib/modules/*/kernel/{drivers,sound}
 rm -rf initramfs/lib/modules/*/kernel/arch/x86/kvm
 


@@ -61,26 +76,24 @@ rm -rf initramfs/boot
 
 # Add some missing configuration files.
 if [ ! -f initramfs/etc/hosts ]; then
 
 # Add some missing configuration files.
 if [ ! -f initramfs/etc/hosts ]; then

-    cat > initramfs/etc/hosts.new <<'__EOF__'
+    cat > hosts.new <<'__EOF__'

 127.0.0.1 guestfs localhost.localdomain localhost
 ::1       localhost6.localdomain6 localhost6
 __EOF__
 127.0.0.1 guestfs localhost.localdomain localhost
 ::1       localhost6.localdomain6 localhost6
 __EOF__

-    @FEBOOTSTRAP_RUN@ initramfs -- \
-       install -m 0644 -o root -g root /etc/hosts.new /etc/hosts
-    rm initramfs/etc/hosts.new
+    install_file hosts.new /etc/hosts 0644 root.root
+    rm hosts.new

 fi
 
 if [ ! -f initramfs/etc/fstab ]; then
     @FEBOOTSTRAP_RUN@ initramfs -- touch /etc/fstab
 fi
 
 fi
 
 if [ ! -f initramfs/etc/fstab ]; then
     @FEBOOTSTRAP_RUN@ initramfs -- touch /etc/fstab
 fi
 

-echo nameserver 10.0.2.3 > initramfs/etc/resolv.conf.new
-@FEBOOTSTRAP_RUN@ initramfs -- \
-    install -m 0644 -o root -g root /etc/resolv.conf.new /etc/resolv.conf
-rm initramfs/etc/resolv.conf.new
+echo nameserver 10.0.2.3 > resolv.conf.new
+install_file resolv.conf.new /etc/resolv.conf 0644 root.root
+rm resolv.conf.new

 
 # Create the init script.
 
 # Create the init script.

-cat > initramfs/init.new <<'__EOF__'
+cat > init.new <<'__EOF__'

 #!/bin/sh
 PATH=/sbin:/usr/sbin:$PATH
 MAKEDEV mem null port zero core full ram tty console fd \
 #!/bin/sh
 PATH=/sbin:/usr/sbin:$PATH
 MAKEDEV mem null port zero core full ram tty console fd \


@@ -88,33 +101,26 @@ MAKEDEV mem null port zero core full ram tty console fd \
 mount -t proc /proc /proc
 mount -t sysfs /sys /sys
 mount -t devpts -o gid=5,mode=620 /dev/pts /dev/pts
 mount -t proc /proc /proc
 mount -t sysfs /sys /sys
 mount -t devpts -o gid=5,mode=620 /dev/pts /dev/pts

-modprobe nfsd 8139cp
+modprobe 8139cp

 /sbin/ifconfig lo 127.0.0.1
 /sbin/ifconfig eth0 10.0.2.10
 /sbin/route add default gw 10.0.2.2
 lvm vgscan --ignorelockingfailure
 lvm vgchange -ay --ignorelockingfailure
 /sbin/ifconfig lo 127.0.0.1
 /sbin/ifconfig eth0 10.0.2.10
 /sbin/route add default gw 10.0.2.2
 lvm vgscan --ignorelockingfailure
 lvm vgchange -ay --ignorelockingfailure

-rpcbind
-rpc.statd
-rpc.nfsd 4
-rpc.mountd

 __EOF__
 
 if [ "x$debug" != "xyes" ]; then
 __EOF__
 
 if [ "x$debug" != "xyes" ]; then

-    echo exec guestfsd -f >> initramfs/init.new
+    echo exec guestfsd -f >> init.new

 else
 else

-    echo guestfsd >> initramfs/init.new
-    echo exec bash -i >> initramfs/init.new
+    echo guestfsd >> init.new
+    echo exec bash -i >> init.new

 fi
 
 fi
 

-@FEBOOTSTRAP_RUN@ initramfs -- install -m 0755 -o root -g root /init.new /init
-rm initramfs/init.new
+install_file init.new /init 0755 root.root
+rm init.new

 
 # Copy the daemon into the filesystem.
 
 # Copy the daemon into the filesystem.

-cp @abs_builddir@/daemon/guestfsd initramfs/sbin/guestfsd.new
-@FEBOOTSTRAP_RUN@ initramfs -- \
-  install -m 0755 -o root -g root /sbin/guestfsd.new /sbin/guestfsd
-rm initramfs/sbin/guestfsd.new
+install_file @abs_builddir@/daemon/guestfsd /sbin/guestfsd 0755 root.root

 
 # Generate final image.
 @FEBOOTSTRAP_TO_INITRAMFS@ initramfs > $output-t
 
 # Generate final image.
 @FEBOOTSTRAP_TO_INITRAMFS@ initramfs > $output-t

diff --git a/update-initramfs.sh.in b/update-initramfs.sh.in
index 89f629c..5076dd3 100755 (executable)
--- a/update-initramfs.sh.in
+++ b/update-initramfs.sh.in
@@ -23,11 +23,24 @@ set -e
 
 output=initramfs.@REPO@.@host_cpu@.img
 
 
 output=initramfs.@REPO@.@host_cpu@.img
 

+# Make a safe 'install_file' function to install files into the
+# filesystem.  XXX We need a 'febootstrap-install' utility.
+# Usage: install_file <local-file> <target-pathname> mode owner[.group]
+install_file ()
+{
+    cp "$1" initramfs/"$2"
+    # Get the inode of the new file and remove it from fakeroot.log.
+    ino=$(ls -i initramfs/"$2" | awk '{print $1}')
+    cp initramfs/fakeroot.log fakeroot.log.old
+    grep -v "ino=$ino," fakeroot.log.old > initramfs/fakeroot.log
+    rm fakeroot.log.old
+    # Set mode, owner and group as desired.
+    @FEBOOTSTRAP_RUN@ initramfs -- chmod "$3" "$2"
+    @FEBOOTSTRAP_RUN@ initramfs -- chown "$4" "$2"
+}
+

 # Copy the daemon into the filesystem.
 # Copy the daemon into the filesystem.

-cp @abs_builddir@/daemon/guestfsd initramfs/sbin/guestfsd.new
-@FEBOOTSTRAP_RUN@ initramfs -- \
-  install -m 0755 -o root -g root /sbin/guestfsd.new /sbin/guestfsd
-rm initramfs/sbin/guestfsd.new
+install_file @abs_builddir@/daemon/guestfsd /sbin/guestfsd 0755 root.root

 
 # Generate final image.
 @FEBOOTSTRAP_TO_INITRAMFS@ initramfs > $output-t
 
 # Generate final image.
 @FEBOOTSTRAP_TO_INITRAMFS@ initramfs > $output-t