diff options
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | debian/changelog | 25 | ||||
| -rwxr-xr-x | scripts/install-system | 2 | ||||
| -rwxr-xr-x | scripts/install/install-get-partition | 2 | ||||
| -rwxr-xr-x | scripts/rl-system.init | 6 | ||||
| -rwxr-xr-x | scripts/vyatta_net_name | 2 | ||||
| -rw-r--r-- | sysconf/vyatta-logrotate-hourly | 5 |
7 files changed, 36 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index ee53e446..501c8005 100644 --- a/Makefile.am +++ b/Makefile.am @@ -99,6 +99,9 @@ udevrulesdir = /lib/udev/rules.d libudev_SCRIPTS = scripts/vyatta_net_name udevrules_DATA = sysconf/65-vyatta-net.rules +cronhourlydir = /etc/cron.hourly +cronhourly_SCRIPTS = sysconf/vyatta-logrotate-hourly + rsyslogdir = /etc/rsyslog.d rsyslog_DATA = sysconf/vyatta-log.conf diff --git a/debian/changelog b/debian/changelog index 10bc95a6..378258ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,28 @@ +vyatta-cfg-system (0.19.24+mendocino8) unstable; urgency=low + + * Bugfix 6684: Don't delete wanpipe config files. + + -- Bob Gilligan <gilligan@vyatta.com> Wed, 19 Jan 2011 19:09:12 -0800 + +vyatta-cfg-system (0.19.24+mendocino7) unstable; urgency=low + + * Bugfix 6687: Need to explicitly specify the RAID metadata version + number. + + -- Bob Gilligan <gilligan@vyatta.com> Mon, 17 Jan 2011 23:04:55 -0800 + +vyatta-cfg-system (0.19.24+mendocino6) unstable; urgency=low + + * Bugfix 6668: Check to see if log files need rotation hourly. + + -- Bob Gilligan <gilligan@vyatta.com> Mon, 17 Jan 2011 19:48:59 -0800 + +vyatta-cfg-system (0.19.24+mendocino5) unstable; urgency=low + + * Bugfix 6156: Policy must be given on command line. + + -- Bob Gilligan <gilligan@vyatta.com> Sun, 16 Jan 2011 23:00:27 -0800 + vyatta-cfg-system (0.19.24+mendocino4) unstable; urgency=low * Change priority of bonding device address diff --git a/scripts/install-system b/scripts/install-system index 17adb98c..9a860d63 100755 --- a/scripts/install-system +++ b/scripts/install-system @@ -469,7 +469,7 @@ check_for_new_raid () { echo "Creating RAID-1 group on partitions: /dev/${drive1}${data_dev} /dev/${drive2}${data_dev}" raid_dev=md0 - mdadm --create /dev/$raid_dev --level=1 --raid-disks=2 /dev/${drive1}${data_dev} /dev/${drive2}${data_dev} + mdadm --create /dev/$raid_dev --level=1 --raid-disks=2 --metadata=0.90 /dev/${drive1}${data_dev} /dev/${drive2}${data_dev} if [ $? = 0 -a -e /dev/$raid_dev ]; then echo "RAID-1 group created successfully:" diff --git a/scripts/install/install-get-partition b/scripts/install/install-get-partition index 50ba7505..9b7aa259 100755 --- a/scripts/install/install-get-partition +++ b/scripts/install/install-get-partition @@ -306,7 +306,7 @@ check_for_new_raid () { echo "Creating RAID-1 group on partitions: /dev/${drive1}${data_dev} /dev/${drive2}${data_dev}" raid_dev=md0 - mdadm --create /dev/$raid_dev --level=1 --raid-disks=2 \ + mdadm --create /dev/$raid_dev --level=1 --raid-disks=2 --metadata=0.90 \ /dev/${drive1}${data_dev} /dev/${drive2}${data_dev} if [ $? = 0 -a -e /dev/$raid_dev ]; then diff --git a/scripts/rl-system.init b/scripts/rl-system.init index fddea32a..3106d593 100755 --- a/scripts/rl-system.init +++ b/scripts/rl-system.init @@ -61,11 +61,6 @@ empty() shopt -s extglob nullglob -clear_serial () { - rm -f /etc/wanpipe/*.conf /etc/ppp/peers/wan* - rm -f /var/run/vyatta/*.description -} - search_config_if_wan () { grep -q "\<serial\>.*\<$1\>" $BOOTFILE } @@ -201,7 +196,6 @@ start () { log_failure_msg "can\'t reset config files" setup_ntp_config_file - clear_serial add_new_serial_if || \ log_failure_msg "can\'t add serial interfaces" diff --git a/scripts/vyatta_net_name b/scripts/vyatta_net_name index d34624ae..43bed36d 100755 --- a/scripts/vyatta_net_name +++ b/scripts/vyatta_net_name @@ -82,7 +82,7 @@ sub biosdevname { # biosdevname renames wlanX to ethX ?? if ($ifname =~ /^eth/) { - my $biosname = `/sbin/biosdevname -i $ifname`; + my $biosname = `/sbin/biosdevname --policy all_ethN -i $ifname`; chomp $biosname; return $biosname if ($biosname ne ''); diff --git a/sysconf/vyatta-logrotate-hourly b/sysconf/vyatta-logrotate-hourly new file mode 100644 index 00000000..055b4d5f --- /dev/null +++ b/sysconf/vyatta-logrotate-hourly @@ -0,0 +1,5 @@ +#!/bin/sh + +test -x /usr/sbin/logrotate || exit 0 +/usr/sbin/logrotate /etc/logrotate.conf + |