* configlets/openbsd/installer_commands_reg_user: see #1368 A fix

for the problem that causes built-in installer to hang after
updating configuration of PF firewalls.
This commit is contained in:
Vadim Kurland
2010-03-28 21:06:35 +00:00
parent 7067fd326b
commit 0f568c4fb8
6 changed files with 35 additions and 2 deletions
+1 -1
View File
@@ -1 +1 @@
#define BUILD_NUM 2769
#define BUILD_NUM 2771
+6
View File
@@ -1,3 +1,9 @@
2010-03-28 vadim <vadim@vk.crocodile.org>
* configlets/openbsd/installer_commands_reg_user: see #1368 A fix
for the problem that causes built-in installer to hang after
updating configuration of PF firewalls.
2010-03-27 vadim <vadim@vk.crocodile.org>
* fixed #1360 "negation of cluster interfaces is broken". Rule
@@ -21,12 +21,15 @@
## {{$fwscript}} -- script name on the firewall
## {{$rbtimeout}} -- rollback timeout
##
## See #1368 for the explanation of the need for the "sleep2; echo" commands
{{if run}}
echo '{{$fwbprompt}}';
chmod +x {{$fwdir}}/{{$fwscript}};
sudo -S {{$fwdir}}/{{$fwscript}} && sudo -S pkill shutdown; echo 'Policy activated'
sleep 2
echo
{{endif}}
@@ -37,12 +40,16 @@ echo '{{$fwbprompt}}';
chmod +x {{$fwdir}}/tmp/{{$fwscript}};
sudo -S /sbin/shutdown -r +{{$rbtimeout}};
sudo -S {{$fwdir}}/tmp/{{$fwscript}} && echo 'Policy activated'
sleep 2
echo
{{endif}}
{{if no_rollback}}
echo '{{$fwbprompt}}';
chmod +x {{$fwdir}}/tmp/{{$fwscript}};
sudo -S {{$fwdir}}/tmp/{{$fwscript}} && echo 'Policy activated'
sleep 2
echo
{{endif}}
@@ -22,12 +22,15 @@
## {{$fwscript}} -- script name on the firewall
## {{$rbtimeout}} -- rollback timeout
##
## See #1368 for the explanation of the need for the "sleep2; echo" commands
{{if run}}
echo '{{$fwbprompt}}';
chmod +x {{$fwdir}}/{{$fwscript}};
sh {{$fwdir}}/{{$fwscript}} && ( pkill shutdown; echo 'Policy activated' )
sleep 2
echo
{{endif}}
{{if test}}
@@ -37,12 +40,16 @@ echo '{{$fwbprompt}}';
/sbin/shutdown -r +{{$rbtimeout}}
chmod +x {{$fwdir}}/{{$fwscript}};
sh {{$fwdir}}/tmp/{{$fwscript}} && echo 'Policy activated'
sleep 2
echo
{{endif}}
{{if no_rollback}}
echo '{{$fwbprompt}}';
chmod +x {{$fwdir}}/{{$fwscript}};
sh {{$fwdir}}/tmp/{{$fwscript}} && echo 'Policy activated'
sleep 2
echo
{{endif}}
@@ -21,12 +21,14 @@
## {{$fwscript}} -- script name on the firewall
## {{$rbtimeout}} -- rollback timeout
##
## See #1368 for the explanation of the need for the "sleep2; echo" commands
{{if run}}
echo '{{$fwbprompt}}';
chmod +x {{$fwdir}}/{{$fwscript}};
sudo -S {{$fwdir}}/{{$fwscript}} && sudo -S pkill shutdown; echo 'Policy activated'
sleep 2
echo
{{endif}}
@@ -37,12 +39,16 @@ echo '{{$fwbprompt}}';
chmod +x {{$fwdir}}/tmp/{{$fwscript}};
sudo -S /sbin/shutdown -r +{{$rbtimeout}};
sudo -S {{$fwdir}}/tmp/{{$fwscript}} && echo 'Policy activated'
sleep 2
echo
{{endif}}
{{if no_rollback}}
echo '{{$fwbprompt}}';
chmod +x {{$fwdir}}/tmp/{{$fwscript}};
sudo -S {{$fwdir}}/tmp/{{$fwscript}} && echo 'Policy activated'
sleep 2
echo
{{endif}}
@@ -22,12 +22,15 @@
## {{$fwscript}} -- script name on the firewall
## {{$rbtimeout}} -- rollback timeout
##
## See #1368 for the explanation of the need for the "sleep2; echo" commands
{{if run}}
echo '{{$fwbprompt}}';
chmod +x {{$fwdir}}/{{$fwscript}};
sh {{$fwdir}}/{{$fwscript}} && ( pkill shutdown; echo 'Policy activated' )
sleep 2
echo
{{endif}}
{{if test}}
@@ -37,12 +40,16 @@ echo '{{$fwbprompt}}';
/sbin/shutdown -r +{{$rbtimeout}}
chmod +x {{$fwdir}}/tmp/{{$fwscript}};
sh {{$fwdir}}/tmp/{{$fwscript}} && echo 'Policy activated'
sleep 2
echo
{{endif}}
{{if no_rollback}}
echo '{{$fwbprompt}}';
chmod +x {{$fwdir}}/tmp/{{$fwscript}};
sh {{$fwdir}}/tmp/{{$fwscript}} && echo 'Policy activated'
sleep 2
echo
{{endif}}