View | Details | Raw Unified | Return to bug 191279 | Differences between
and this patch

Collapse All | Expand All

(-)qjail-3.4-92-rc-d-fix/usr/local/bin/qjail (-1 / +1 lines)
Lines 1814-1820 Link Here
1814
  number=`echo "${release_number}" | awk '{print $1}'`
1814
  number=`echo "${release_number}" | awk '{print $1}'`
1815
  number=${number}`echo "${release_number}" | awk '{print $2}'`
1815
  number=${number}`echo "${release_number}" | awk '{print $2}'`
1816
              
1816
              
1817
  if [ ${number} -ge 93 ]; then
1817
  if [ ${number} -ge 92 ]; then
1818
    installarch=`uname -p`
1818
    installarch=`uname -p`
1819
    installarch="${installarch}/${installarch}"
1819
    installarch="${installarch}/${installarch}"
1820
  else        
1820
  else        
(-)qjail-3.4-92-rc-d-fix/usr/local/etc/rc.d/qjail.bootime (+13 lines)
Lines 72-77 Link Here
72
  eval vnet=\"\${vnet}\"
72
  eval vnet=\"\${vnet}\"
73
  eval vnet_interface=\"\${vinterface}\"
73
  eval vnet_interface=\"\${vinterface}\"
74
  eval allow_raw_sockets=\"\${rsockets}\"
74
  eval allow_raw_sockets=\"\${rsockets}\"
75
  eval devfs_ruleset_number=\"\${ruleset}\"
76
  eval allow_sysvipc=\"\${sysvipc}\"
75
  eval allow_quotas=\"\${quotas}\"
77
  eval allow_quotas=\"\${quotas}\"
76
  eval allow_mount_nullfs=\"\${nullfs}\"
78
  eval allow_mount_nullfs=\"\${nullfs}\"
77
  eval allow_mount_zfs=\"\${zfs}\"
79
  eval allow_mount_zfs=\"\${zfs}\"
Lines 103-108 Link Here
103
  echo "vnet=\"${vnet}\""
105
  echo "vnet=\"${vnet}\""
104
  echo "vinterface=\"${vnet_interface}\""
106
  echo "vinterface=\"${vnet_interface}\""
105
  echo "rsockets=\"${allow_raw_sockets}\""
107
  echo "rsockets=\"${allow_raw_sockets}\""
108
  echo "ruleset=\"${devfs_ruleset_number}\""
109
  echo "sysvipc=\"${allow_sysvipc}\""
106
  echo "quotas=\"${allow_quotas}\""
110
  echo "quotas=\"${allow_quotas}\""
107
  echo "nullfs=\"${allow_mount_nullfs}\""
111
  echo "nullfs=\"${allow_mount_nullfs}\""
108
  echo "zfs=\"${allow_mount_zfs}\""
112
  echo "zfs=\"${allow_mount_zfs}\""
Lines 154-159 Link Here
154
    [ ${allow_raw_sockets} ]  && \
158
    [ ${allow_raw_sockets} ]  && \
155
    echo "allow.raw_sockets;"
159
    echo "allow.raw_sockets;"
156
160
161
    [ ${devfs_ruleset_number} ] && \
162
    echo "devfs_ruleset       =  \"${devfs_ruleset_number}\";"
163
               
164
    [ ${devfs_ruleset_number} ] || \
165
    echo "devfs_ruleset       =  \"4\";"
166
167
    [ ${allow_sysvipc} ]      && \
168
    echo "allow.sysvipc;"
169
               
157
    [ ${allow_quotas} ]       && \
170
    [ ${allow_quotas} ]       && \
158
    echo "allow.quotas;"
171
    echo "allow.quotas;"

Return to bug 191279