Changes since v1: Removed the $header portion so all marks are now simply: |--- BEGIN PVE --- |<data> |--- END PVE ---
The modify function looks for lines matching /---BEGIN PVE.*/ rather than the complete line since we used 'BEGIN PVE ROUTES' markers in the RedHat and SUSE container types previously, so they will be updated to the new markers as well. Wolfgang Bumiller (2): Setup::Base: more generic ct_modify_file function change update_etc_hosts to use ct_modify_file src/PVE/LXC/Setup/Base.pm | 178 ++++++++++----------- src/PVE/LXC/Setup/Redhat.pm | 15 +- src/PVE/LXC/Setup/SUSE.pm | 4 +- src/test/test-centos6-001/etc/hosts.exp | 3 + src/test/test-centos6-001/etc/resolv.conf.exp | 2 + src/test/test-debian-001/etc/hosts.exp | 3 + src/test/test-debian-002/etc/hosts.exp | 3 + src/test/test-debian-003/etc/hosts.exp | 3 + src/test/test-debian-004/etc/hosts.exp | 3 + src/test/test-debian-005/etc/hosts.exp | 3 + src/test/test-debian-006/etc/hosts.exp | 3 + src/test/test-debian-007/etc/hosts.exp | 3 + src/test/test-debian-007/etc/resolv.conf | 2 + src/test/test-debian-007/etc/resolv.conf.exp | 2 + src/test/test-debian-008/etc/hosts.exp | 4 + src/test/test-debian-008/etc/resolv.conf | 8 + src/test/test-debian-008/etc/resolv.conf.exp | 7 + src/test/test-debian-009/etc/hosts.exp | 3 + src/test/test-debian-010/etc/hosts.exp | 3 + src/test/test-debian-013/etc/hosts.exp | 3 + src/test/test-opensuse-001/etc/hosts.exp | 3 + src/test/test-opensuse-001/etc/resolv.conf.exp | 2 + .../etc/sysconfig/network/ifroute-eth0.exp | 4 +- .../etc/sysconfig/network/ifroute-eth0.exp | 4 +- .../etc/sysconfig/network/ifroute-eth0.exp | 4 +- 25 files changed, 160 insertions(+), 112 deletions(-) create mode 100644 src/test/test-debian-007/etc/resolv.conf create mode 100644 src/test/test-debian-008/etc/resolv.conf -- 2.1.4 _______________________________________________ pve-devel mailing list pve-devel@pve.proxmox.com http://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
