diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | debian/vyatta-cfg-system.postinst.in | 9 | ||||
| -rwxr-xr-x | scripts/install-system | 14 |
3 files changed, 15 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index 340f905f..0d574833 100644 --- a/Makefile.am +++ b/Makefile.am @@ -39,6 +39,7 @@ sbin_SCRIPTS += scripts/dns-forwarding/vyatta-dns-forwarding.pl sbin_SCRIPTS += scripts/dynamic-dns/vyatta-dynamic-dns.pl sbin_SCRIPTS += scripts/vyatta-system-nameservers sbin_SCRIPTS += scripts/vyatta-bonding.pl +sbin_SCRIPTS += scripts/vyatta-raid-event noinst_DATA = test_bootfile diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in index 73b0b813..0f699d2b 100644 --- a/debian/vyatta-cfg-system.postinst.in +++ b/debian/vyatta-cfg-system.postinst.in @@ -59,7 +59,11 @@ Cmnd_Alias IPTABLES = /sbin/iptables --list -n,\ Cmnd_Alias IPFLUSH = /sbin/ip route flush cache, \ /sbin/ip route flush cache *,\ /sbin/ip neigh flush to *, \ - /sbin/ip neigh flush dev * + /sbin/ip neigh flush dev *, \ + /sbin/ip -f inet6 route flush cache, \ + /sbin/ip -f inet6 route flush cache *,\ + /sbin/ip -f inet6 neigh flush to *, \ + /sbin/ip -f inet6 neigh flush dev * Cmnd_Alias ETHTOOL = /usr/sbin/ethtool -p *, \ /usr/sbin/ethtool -S *, \ /usr/sbin/ethtool -a *, \ @@ -69,7 +73,8 @@ Cmnd_Alias DATE = /bin/date, /usr/sbin/ntpdate Cmnd_Alias PPPOE_CMDS = /sbin/pppd, /sbin/poff, /usr/sbin/pppstats Cmnd_Alias PCAPTURE = /usr/bin/tshark, /usr/bin/tcpdump %operator ALL=NOPASSWD: DATE, IPTABLES, ETHTOOL, IPFLUSH, \ - PPPOE_CMDS, PCAPTURE, /usr/sbin/wanpipemon, /usr/bin/lsof + PPPOE_CMDS, PCAPTURE, /usr/sbin/wanpipemon, \ + /usr/bin/lsof, /usr/sbin/conntrack EOF cat <<EOF >>/etc/sudoers %users ALL=NOPASSWD: ${bindir}/sudo-users/ diff --git a/scripts/install-system b/scripts/install-system index bb1c4385..65a31571 100755 --- a/scripts/install-system +++ b/scripts/install-system @@ -356,14 +356,14 @@ check_for_new_raid () { part_start_offset=2 part_diag_size=60 - if [ $drivesize1 -gt $drivesize2 ]; then - size=$drivesize1 + if [ $drivesize1 -lt $drivesize2 ]; then + root_size=$drivesize1 else - size=$drivesize2 + root_size=$drivesize2 fi let min_size_with_diag=${MIN_ROOT}+${part_diag_size} - if [ $size -ge $min_size_with_diag ]; then + if [ $root_size -ge $min_size_with_diag ]; then echo "Would you like me to create a $part_diag_size MB partition for diagnostics?" echo -n "(Yes/No) [No]: " diag_response=$(get_response "No" "Yes No Y N") @@ -381,12 +381,12 @@ check_for_new_raid () { fi fi - let size-=$part_start_offset + let root_size-=$part_start_offset for drive in $drives do echo "Creating data partition: /dev/${drive}${data_dev}" - create_partitions "$drive" $size $part_start_offset "no" + create_partitions "$drive" $root_size $part_start_offset "no" sfdisk --change-id /dev/$drive $data_dev 0xfd done @@ -653,7 +653,7 @@ create_partitions() { # Make sure there is enough space on drive size=$(get_drive_size "$ldrive") if [ "$root_part_size" -gt "$size" ]; then - echo "Error: $ldrive is only $size"MB" large." + echo "Error: $ldrive is only $size"MB" large. Desired root is $root_part_size" exit 1 fi |