Attachment 144452 Details for Bug 191279 – Patch file, in 'diff -ruN' format

[patch] Patch file, in 'diff -ruN' format

qjail-3.4-92-rc-d-fix.patch (text/plain), 1.89 KB, created by dreamcat4 on 2014-07-06 11:55:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: dreamcat4

Created: 2014-07-06 11:55:40 UTC

Size: 1.89 KB

patch

obsolete

>diff -ruN qjail-3.4/usr/local/bin/qjail qjail-3.4-92-rc-d-fix/usr/local/bin/qjail
>--- qjail-3.4/usr/local/bin/qjail	2014-07-01 20:41:32.000000000 +0100
>+++ qjail-3.4-92-rc-d-fix/usr/local/bin/qjail	2014-07-01 20:45:24.000000000 +0100
>@@ -1814,7 +1814,7 @@
>   number=`echo "${release_number}" | awk '{print $1}'`
>   number=${number}`echo "${release_number}" | awk '{print $2}'`
>               
>-  if [ ${number} -ge 93 ]; then
>+  if [ ${number} -ge 92 ]; then
>     installarch=`uname -p`
>     installarch="${installarch}/${installarch}"
>   else        
>diff -ruN qjail-3.4/usr/local/etc/rc.d/qjail.bootime qjail-3.4-92-rc-d-fix/usr/local/etc/rc.d/qjail.bootime
>--- qjail-3.4/usr/local/etc/rc.d/qjail.bootime	2014-07-06 12:26:09.000000000 +0100
>+++ qjail-3.4-92-rc-d-fix/usr/local/etc/rc.d/qjail.bootime	2014-07-06 12:45:26.000000000 +0100
>@@ -72,6 +72,8 @@
>   eval vnet=\"\${vnet}\"
>   eval vnet_interface=\"\${vinterface}\"
>   eval allow_raw_sockets=\"\${rsockets}\"
>+  eval devfs_ruleset_number=\"\${ruleset}\"
>+  eval allow_sysvipc=\"\${sysvipc}\"
>   eval allow_quotas=\"\${quotas}\"
>   eval allow_mount_nullfs=\"\${nullfs}\"
>   eval allow_mount_zfs=\"\${zfs}\"
>@@ -103,6 +105,8 @@
>   echo "vnet=\"${vnet}\""
>   echo "vinterface=\"${vnet_interface}\""
>   echo "rsockets=\"${allow_raw_sockets}\""
>+  echo "ruleset=\"${devfs_ruleset_number}\""
>+  echo "sysvipc=\"${allow_sysvipc}\""
>   echo "quotas=\"${allow_quotas}\""
>   echo "nullfs=\"${allow_mount_nullfs}\""
>   echo "zfs=\"${allow_mount_zfs}\""
>@@ -154,6 +158,15 @@
>     [ ${allow_raw_sockets} ]  && \
>     echo "allow.raw_sockets;"
> 
>+    [ ${devfs_ruleset_number} ] && \
>+    echo "devfs_ruleset       =  \"${devfs_ruleset_number}\";"
>+               
>+    [ ${devfs_ruleset_number} ] || \
>+    echo "devfs_ruleset       =  \"4\";"
>+
>+    [ ${allow_sysvipc} ]      && \
>+    echo "allow.sysvipc;"
>+               
>     [ ${allow_quotas} ]       && \
>     echo "allow.quotas;"

Actions: View | Diff

Attachments on bug 191279: 144450 | 144452 | 144453