diff options
| author | Mohit Mehta <mohit@vyatta.com> | 2010-09-13 15:00:58 -0700 |
|---|---|---|
| committer | Mohit Mehta <mohit@vyatta.com> | 2010-09-13 15:00:58 -0700 |
| commit | 780baf289935a69e970e629467329013ba089760 (patch) | |
| tree | 8d6a283abaa3e12bde919aac05c5ee11c819f8a1 | |
| parent | 67a67cc557f5a83694c8e3a053f157882e87367e (diff) | |
| download | vyatta-cfg-firewall-780baf289935a69e970e629467329013ba089760.tar.gz vyatta-cfg-firewall-780baf289935a69e970e629467329013ba089760.zip | |
Fix bug 6149 Warning on boot because of modprobe config file names
* rename existing files instead of removing em. rename sip option file as well
| -rw-r--r-- | debian/vyatta-cfg-firewall.postinst.in | 4 | ||||
| -rw-r--r-- | templates/firewall/conntrack-options/sip/node.def | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/debian/vyatta-cfg-firewall.postinst.in b/debian/vyatta-cfg-firewall.postinst.in index 3bfd95e..f4158c1 100644 --- a/debian/vyatta-cfg-firewall.postinst.in +++ b/debian/vyatta-cfg-firewall.postinst.in @@ -12,9 +12,9 @@ ln -sf /opt/vyatta/sbin/vyatta-ipset.pl ${bindir}/sudo-users/vyatta-ipset.pl # comply with Squeeze version of modprobe # remove old versions of files during upgrade -for modprobe in vyatta_nf_conntrack vyatta_xt_recent +for modprobe in vyatta_nf_conntrack vyatta_xt_recent vyatta_sip_options do if [ -f /etc/modprobe.d/${modprobe} ]; then - rm -f /etc/modprobe.d/${modprobe} + mv -f -n /etc/modprobe.d/${modprobe} /etc/modprobe.d/${modprobe}.conf fi done diff --git a/templates/firewall/conntrack-options/sip/node.def b/templates/firewall/conntrack-options/sip/node.def index ee79af1..afc15d6 100644 --- a/templates/firewall/conntrack-options/sip/node.def +++ b/templates/firewall/conntrack-options/sip/node.def @@ -47,10 +47,10 @@ end: reload=0 if [ -n "$indirectmedia" ] || [ -n "$indirectsignalling" ] || \ [ -n "$portopt" ]; then - sudo sh -c "echo \# Auto-generated by `whoami` at `date` > /etc/modprobe.d/vyatta_sip_options" - sudo sh -c "echo options nf_conntrack_sip $indirectmedia $indirectsignalling $portopt >> /etc/modprobe.d/vyatta_sip_options " + sudo sh -c "echo \# Auto-generated by `whoami` at `date` > /etc/modprobe.d/vyatta_sip_options.conf" + sudo sh -c "echo options nf_conntrack_sip $indirectmedia $indirectsignalling $portopt >> /etc/modprobe.d/vyatta_sip_options.conf " else - sudo rm -f /etc/modprobe.d/vyatta_sip_options + sudo rm -f /etc/modprobe.d/vyatta_sip_options.conf fi if [ $reload -eq 1 ]; then |