using virsh lxc-enter-namespace instead of lxcsu

[build.git] / lbuild-initvm.sh

diff --git a/lbuild-initvm.sh b/lbuild-initvm.sh
index 9eda8d9..886bff1 100755 (executable)
--- a/lbuild-initvm.sh
+++ b/lbuild-initvm.sh
@@ -8,11 +8,7 @@ DIRNAME=$(dirname $0)
 BUILD_DIR=$(pwd)
 
 # pkgs parsing utilities
-PATH=$(dirname $0):$PATH export PATH
-
-# old guests have e.g. mount in /bin but this is no longer part of 
-# the standard PATH in recent hosts after usrmove, so let's keep it simple
-export PATH=PATH=$PATH:/bin:/sbin 
+export PATH=$(dirname $0):$PATH
 
 . build.common
 
@@ -730,7 +726,14 @@ function devel_or_vtest_tools () {
            chroot $rootfs_path apt-get update
            for package in $packages ; do
                # close stdin in an attempt to avoid this hanging
-               chroot $rootfs_path apt-get install -y $package < /dev/null
+               # xxx also we ignore result for now, not sure if the kind of errors like below
+               # truly is serious or not
+#Setting up at (3.1.13-2ubuntu2) ...
+#initctl: Unable to connect to Upstart: Failed to connect to socket /com/ubuntu/upstart: Connection refused
+#initctl: Unable to connect to Upstart: Failed to connect to socket /com/ubuntu/upstart: Connection refused
+#start: Unable to connect to Upstart: Failed to connect to socket /com/ubuntu/upstart: Connection refused
+
+               chroot $rootfs_path apt-get install -y $package < /dev/null || :
            done
            ### xxx todo install groups with apt..
            ;;
@@ -749,7 +752,7 @@ function post_install () {
        post_install_build $lxc $personality
        lxc_start $lxc
        # manually run dhclient in guest - somehow this network won't start on its own
-       virsh -c lxc:/// lxc-enter-namespace $lxc /usr/sbin/dhclient $VIF_GUEST
+       virsh -c lxc:/// lxc-enter-namespace $lxc $(bin_in_container $lxc dhclient) $VIF_GUEST
     else
        post_install_myplc $lxc $personality
        lxc_start $lxc