]> git.madduck.net Git - code/vinst.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Parametrise the network bridge
authormartin f. krafft <madduck@madduck.net>
Wed, 26 Feb 2014 13:05:52 +0000 (14:05 +0100)
committermartin f. krafft <madduck@madduck.net>
Wed, 26 Feb 2014 13:05:52 +0000 (14:05 +0100)
vinst

diff --git a/vinst b/vinst
index c6abe7299c743083329be4493c74f7bad0925a24..73d50c418d257c593495da5871bb9678375cc701 100755 (executable)
--- a/vinst
+++ b/vinst
@@ -100,8 +100,11 @@ if [ -n "$IPADDRESS" ]; then
   netcfg/get_gateway=$GATEWAY \
   netcfg/get_nameservers=$NAMESERVER"
 
+  BRIDGE=wan
+
 else
   extra_args="$extra_args netcfg/disable_dhcp=false"
+  BRIDGE=virt-br
 fi
 
 cat >&2 <<_eof
@@ -109,6 +112,7 @@ cat >&2 <<_eof
        ram: $RAM MiB
       disk: $DISK GiB
    console: $CONSOLE
+net bridge: $BRIDGE
 _eof
 if [ -n "$IPADDRESS" ]; then
   cat >&2 <<_eof
@@ -129,7 +133,7 @@ exec virt-install --connect=$QEMU_URI \
   -n $HOSTNAME \
   -r $RAM \
   --disk pool=default,size=$SIZE \
-  -w bridge=virt-br \
+  -w bridge=$BRIDGE \
   --graphics=vnc \
   --serial=pty \
   --watchdog i6300esb,action=reset \