patch-dynagen 1.8 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243
  1. $OpenBSD: patch-dynagen,v 1.2 2008/11/23 14:24:21 sthen Exp $
  2. --- dynagen.orig Sun Nov 23 14:03:28 2008
  3. +++ dynagen Sun Nov 23 14:03:36 2008
  4. @@ -1,4 +1,4 @@
  5. -#!/usr/bin/python
  6. +#!${MODPY_BIN}
  7. # -*- coding: utf-8 -*-
  8. """
  9. @@ -25,8 +25,8 @@ import sys
  10. import os
  11. import re
  12. import traceback
  13. -from console import Console
  14. -from dynamips_lib import Dynamips, PA_C7200_IO_FE, PA_A1, PA_FE_TX, PA_4T, PA_8T, \
  15. +from dynagen.console import Console
  16. +from dynagen.dynamips_lib import Dynamips, PA_C7200_IO_FE, PA_A1, PA_FE_TX, PA_4T, PA_8T, \
  17. PA_4E, PA_8E, PA_POS_OC3, Router, C7200, C3600, Leopard_2FE, NM_1FE_TX, NM_1E, NM_4E, \
  18. NM_16ESW, NM_4T, DynamipsError, DynamipsWarning, Bridge, FRSW, ATMSW, ETHSW, ATMBR, \
  19. NIO_udp, NIO_linux_eth, NIO_gen_eth, NIO_tap, NIO_unix, NIO_vde, NIO_null, nosend, setdebug, \
  20. @@ -34,16 +34,16 @@ from dynamips_lib import Dynamips, PA_C7200_IO_FE, PA_
  21. CISCO2600_MB_1E, CISCO2600_MB_2E, CISCO2600_MB_1FE, CISCO2600_MB_2FE, PA_2FE_TX, \
  22. PA_GE, PA_C7200_IO_2FE, PA_C7200_IO_GE_E, C1700, CISCO1710_MB_1FE_1E, C1700_MB_1ETH, \
  23. DEVICETUPLE, DynamipsVerError, DynamipsErrorHandled, NM_CIDS, NM_NAM, get_reverse_udp_nio
  24. -from pemu_lib import Pemu, FW, nosend_pemu
  25. -from validate import Validator
  26. -from configobj import ConfigObj, flatten_errors
  27. +from dynagen.pemu_lib import Pemu, FW, nosend_pemu
  28. +from dynagen.validate import Validator
  29. +from dynagen.configobj import ConfigObj, flatten_errors
  30. from optparse import OptionParser
  31. # Constants
  32. VERSION = '0.11.0'
  33. -CONFIGSPECPATH = ['/usr/share/dynagen', '/usr/local/share']
  34. +CONFIGSPECPATH = ['${LOCALBASE}/share/dynagen']
  35. CONFIGSPEC = 'configspec'
  36. -INIPATH = ['/etc', '/usr/local/etc']
  37. +INIPATH = ['${SYSCONFDIR}']
  38. INIFILE = 'dynagen.ini'
  39. MODELTUPLE = ( # A tuple of known model objects
  40. C1700,