From 5e4ead28e0d5d6011fb1f7fee2cedaa5d9242fe4 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Sat, 7 Jun 2008 09:24:52 -0700 Subject: wrong option to useradd Manpage for useradd is incorrect, the option is -N not -n. --- scripts/system/vyatta_update_login.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/system/vyatta_update_login.pl b/scripts/system/vyatta_update_login.pl index 61fe68ca..bd103c57 100755 --- a/scripts/system/vyatta_update_login.pl +++ b/scripts/system/vyatta_update_login.pl @@ -76,7 +76,7 @@ for my $user (@user_keys) { # make new user using vyatta shell # and make home directory (-m) # and with default group of 100 (users) - $cmd = 'useradd -s /bin/vbash -m -n'; + $cmd = 'useradd -s /bin/vbash -m -N'; } # TODO Add checks for attempts to put system users # in configuration file -- cgit v1.2.3 From e0f11e3d2423c796f27a46d322dc0ce49524fde9 Mon Sep 17 00:00:00 2001 From: Stig Thormodsrud Date: Mon, 9 Jun 2008 14:19:54 -0700 Subject: Fix 3328: operator can't issue "show vrrp". --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index ff8f646f..3ad950a8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,7 +24,6 @@ sbin_SCRIPTS += scripts/snmp/vyatta-snmp.pl sbin_SCRIPTS += scripts/snmp/snmpd.init sbin_SCRIPTS += scripts/keepalived/vyatta-keepalived.pl sbin_SCRIPTS += scripts/keepalived/vyatta-vrrp-state.pl -sbin_SCRIPTS += scripts/keepalived/vyatta-show-vrrp.pl sbin_SCRIPTS += scripts/telnetd.init sbin_SCRIPTS += scripts/add_bootfile_eth_hwid sbin_SCRIPTS += scripts/mod_bootfile_eth_hwid @@ -34,6 +33,7 @@ noinst_DATA = test_bootfile share_perl5_DATA = scripts/keepalived/VyattaKeepalived.pm bin_sudo_users_SCRIPTS = scripts/keepalived/vyatta-clear-vrrp.pl +bin_sudo_users_SCRIPTS += scripts/keepalived/vyatta-show-vrrp.pl sysconf_DATA += sysconf/LICENSE sysconf_DATA += sysconf/logrotate_messages -- cgit v1.2.3 From d55efddd05900b84c583803980943b7097b80faa Mon Sep 17 00:00:00 2001 From: Bob Gilligan Date: Mon, 9 Jun 2008 15:52:58 -0700 Subject: Bugfix: 3305 Get grub to allow the user to interrupt the boot and drop into the grub menu via either the serial or KVM console. --- scripts/install-system | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/scripts/install-system b/scripts/install-system index 56f2e433..8f2be62b 100755 --- a/scripts/install-system +++ b/scripts/install-system @@ -577,14 +577,24 @@ install_grub () { echo -e "set default=$DEFAULT_CONSOLE" echo "set timeout=5" #echo "#set splashimage=(hd0,0)/grub/splash.xpm.gz" - echo "hiddenmenu" # set serial console options echo -e "serial --unit=0 --speed=9600" - echo "terminal --timeout=5 console serial" + echo "terminal serial" echo "set root=$root" + + echo "" + echo "echo -n Press ESC to enter the Grub menu..." + echo "if sleep --verbose --interruptible 5 ; then" + echo -e "\tterminal console" + echo -e "\techo -n Press the ESC key to enter the Grub menu..." + echo -e "\tif sleep --verbose --interruptible 5 ; then" + echo -e "\t\tterminal serial" + echo -e "\t\tset timeout=0" + echo -e "\tfi" + echo "fi" + echo "" + if [ -f "/boot/vmlinuz" ]; then - echo -e "set default=$DEFAULT_CONSOLE\n\n\n" - # Set first system boot option. Make KVM the default console in this one. echo -e "menuentry \"Vyatta OFR (KVM console)\" {" echo -en "\tlinux /boot/vmlinuz root=/dev/$ROOT_PARTITION $ISCF console=ttyS0,9600 console=tty0 \n" -- cgit v1.2.3 From 88ff71306683cc98101190227497264ca6197557 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 9 Jun 2008 16:33:36 -0700 Subject: Allow operator to run wanpipemon Add entry to sudoers to allow wanpipemon command --- debian/vyatta-cfg-system.postinst.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in index aa6f6310..0852319e 100644 --- a/debian/vyatta-cfg-system.postinst.in +++ b/debian/vyatta-cfg-system.postinst.in @@ -47,7 +47,7 @@ Cmnd_Alias ETHTOOLP = /usr/sbin/ethtool -p * Cmnd_Alias DATE = /bin/date, /usr/sbin/ntpdate Cmnd_Alias PPPOE_CMDS = /sbin/pppd, /sbin/poff %operator ALL=NOPASSWD: /sbin/reboot, DATE, IPTABLES, ETHTOOLP, IPFLUSH, \ - PPPOE_CMDS, /usr/bin/tshark + PPPOE_CMDS, /usr/bin/tshark, /usr/sbin/wanpipemon ### END VYATTA OPERATOR COMMANDS EOF fi -- cgit v1.2.3