From 629acfb44e5fccb18a19092034913eddf6cc1c1c Mon Sep 17 00:00:00 2001 From: Bob Gilligan Date: Wed, 13 Aug 2008 19:06:36 -0700 Subject: Bugfix: 1292 Disable logo per instructions from Anatoly. --- scripts/grub-setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/grub-setup b/scripts/grub-setup index 1e6751d9..a681a955 100755 --- a/scripts/grub-setup +++ b/scripts/grub-setup @@ -119,7 +119,7 @@ vga_logo="vga=785" if [ -f "/boot/vmlinuz" ]; then # Set first system boot option. Make KVM the default console in this one. echo -e "menuentry \"Vyatta OFR (KVM console)\" {" - echo -e "\tlinux /boot/vmlinuz $GRUB_OPTIONS $vga_logo $vty_console" + echo -e "\tlinux /boot/vmlinuz $GRUB_OPTIONS $vty_console" echo -e "\tinitrd /boot/initrd.img" echo -e "}" -- cgit v1.2.3 From 0aa22026802ff43c59e4bd4fc4a4846ea18f1572 Mon Sep 17 00:00:00 2001 From: Mark O'Brien Date: Tue, 19 Aug 2008 17:48:26 -0700 Subject: 3.1.3 --- debian/changelog | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/debian/changelog b/debian/changelog index 7ed7b81c..803fdb87 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,27 @@ +vyatta-cfg-system (0.13) unstable; urgency=low + + 3.1.3 + [ Mark O'Brien ] + + + [ Bob Gilligan ] + * Bugfix: 1292 + * Bugfix: 1292 + + [ rbalocca ] + * More spaces (bugs http://bugzilla.vyatta.com/show_bug.cgi?id=3549 + and http://bugzilla.vyatta.com/show_bug.cgi?id=3552) + * Fixes for bugs: http://bugzilla.vyatta.com/show_bug.cgi?id=3549 and + http://bugzilla.vyatta.com/show_bug.cgi?id=3552 + + [ Rick Balocca ] + * Merge from islavista + * Fix for http://bugzilla.vyatta.com/show_bug.cgi?id=3520 + + [ Mark O'Brien ] + + -- Mark O'Brien Tue, 19 Aug 2008 17:48:26 -0700 + vyatta-cfg-system (0.12) unstable; urgency=low 3.1.2 -- cgit v1.2.3 From f620e503c6fef389baafe909d1beaf5036ecffa9 Mon Sep 17 00:00:00 2001 From: Bob Gilligan Date: Tue, 26 Aug 2008 16:48:35 -0700 Subject: Add mdadm package to support RAID-1 configurations. --- debian/control | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index bcca954f..f5ea7b48 100644 --- a/debian/control +++ b/debian/control @@ -35,7 +35,8 @@ Depends: sed (>= 4.1.5), tasksel, snmp, tcpdump, - dnsmasq + dnsmasq, + mdadm Pre-Depends: bash-completion Suggests: util-linux (>= 2.13-5), net-tools, -- cgit v1.2.3 From 2a6ed4bed75d086eb805a53b0c296a32b9d8bac9 Mon Sep 17 00:00:00 2001 From: rbalocca Date: Tue, 26 Aug 2008 17:27:48 -0700 Subject: Merge from "hollywood" --- debian/changelog | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/debian/changelog b/debian/changelog index 7ed7b81c..803fdb87 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,27 @@ +vyatta-cfg-system (0.13) unstable; urgency=low + + 3.1.3 + [ Mark O'Brien ] + + + [ Bob Gilligan ] + * Bugfix: 1292 + * Bugfix: 1292 + + [ rbalocca ] + * More spaces (bugs http://bugzilla.vyatta.com/show_bug.cgi?id=3549 + and http://bugzilla.vyatta.com/show_bug.cgi?id=3552) + * Fixes for bugs: http://bugzilla.vyatta.com/show_bug.cgi?id=3549 and + http://bugzilla.vyatta.com/show_bug.cgi?id=3552 + + [ Rick Balocca ] + * Merge from islavista + * Fix for http://bugzilla.vyatta.com/show_bug.cgi?id=3520 + + [ Mark O'Brien ] + + -- Mark O'Brien Tue, 19 Aug 2008 17:48:26 -0700 + vyatta-cfg-system (0.12) unstable; urgency=low 3.1.2 -- cgit v1.2.3 From 77aec3233519e24bb78f1664104b2a1967c92aa4 Mon Sep 17 00:00:00 2001 From: Rick Balocca Date: Fri, 29 Aug 2008 11:35:54 -0700 Subject: Merge from "hollywood" --- scripts/grub-setup | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/grub-setup b/scripts/grub-setup index a681a955..45d39cd0 100755 --- a/scripts/grub-setup +++ b/scripts/grub-setup @@ -119,7 +119,7 @@ vga_logo="vga=785" if [ -f "/boot/vmlinuz" ]; then # Set first system boot option. Make KVM the default console in this one. echo -e "menuentry \"Vyatta OFR (KVM console)\" {" - echo -e "\tlinux /boot/vmlinuz $GRUB_OPTIONS $vty_console" + echo -e "\tlinux /boot/vmlinuz $GRUB_OPTIONS $vga_logo $vty_console" echo -e "\tinitrd /boot/initrd.img" echo -e "}" @@ -139,7 +139,7 @@ vga_logo="vga=785" echo echo -e "menuentry \"Vyatta Xen linux$xversion dom0\" {" echo -e "\tmultiboot /boot/$xen_version " - echo -e "\tmodule /boot/vmlinuz$xversion $GRUB_OPTIONS $vty_console" + echo -e "\tmodule /boot/vmlinuz$xversion $GRUB_OPTIONS $vga_logo $vty_console" echo -e "\tmodule /boot/initrd.img$xversion" echo -e "}" done @@ -150,7 +150,7 @@ vga_logo="vga=785" for kversion in $kernel_versions; do echo echo -e "menuentry \"Vyatta OFR linux$kversion (KVM console)\" {" - echo -e "\tlinux /boot/vmlinuz$kversion $GRUB_OPTIONS $vty_console" + echo -e "\tlinux /boot/vmlinuz$kversion $GRUB_OPTIONS $vga_logo $vty_console" echo -e "\tinitrd /boot/initrd.img$kversion" echo -e "}" echo @@ -166,7 +166,7 @@ vga_logo="vga=785" echo echo -e "menuentry \"Root password reset to factory (KVM console)\" {" - echo -e "\tlinux /boot/vmlinuz $GRUB_OPTIONS $vty_console init=$pass_reset" + echo -e "\tlinux /boot/vmlinuz $GRUB_OPTIONS $vga_logo $vty_console init=$pass_reset" echo -e "\tinitrd /boot/initrd.img" echo -e "}" -- cgit v1.2.3