diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-06-10 22:37:15 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-06-10 22:37:15 -0700 |
| commit | b4b2864a93b38e3e900164564f262b0375fcec24 (patch) | |
| tree | 2ed38d57f2e3a5d06c304e399c525f6a223deede | |
| parent | c2db47deb9aa0661468a36822b5105ed1fe51918 (diff) | |
| parent | 88ff71306683cc98101190227497264ca6197557 (diff) | |
| download | vyatta-cfg-system-b4b2864a93b38e3e900164564f262b0375fcec24.tar.gz vyatta-cfg-system-b4b2864a93b38e3e900164564f262b0375fcec24.zip | |
Merge branch 'hollywood' of suva.vyatta.com:/git/vyatta-cfg-system into hollywood
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | debian/vyatta-cfg-system.postinst.in | 2 | ||||
| -rwxr-xr-x | scripts/install-system | 18 | ||||
| -rwxr-xr-x | scripts/system/vyatta_update_login.pl | 2 |
4 files changed, 17 insertions, 7 deletions
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 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 diff --git a/scripts/install-system b/scripts/install-system index ad12de32..12ae10ed 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. # mode values for vga= # Color depth | 640x480 | 800x600 | 1024x768 | 1280x1024 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 |