From 55e7248013601a6120d343fc6a345f0e0ae98cfb Mon Sep 17 00:00:00 2001 From: Michael Larson Date: Tue, 10 May 2011 14:21:27 -0700 Subject: support interactive mode for rest api for install image op mode commands. --- scripts/install/install-functions | 11 ++++++++--- scripts/install/install-image-existing | 6 +++++- scripts/install/install-image-new | 6 +++++- 3 files changed, 18 insertions(+), 5 deletions(-) (limited to 'scripts') diff --git a/scripts/install/install-functions b/scripts/install/install-functions index ffaea22d..5670f82a 100755 --- a/scripts/install/install-functions +++ b/scripts/install/install-functions @@ -96,9 +96,14 @@ get_response () { local ldefault=$(tolower "$1") local loptions=$(tolower "$2") - # get the response from the user - read myresponse - myresponse=$(tolower "$myresponse") + + if [ "$VYATTA_PROCESS_CLIENT" == "gui2_rest" ]; then + myresponse=$ldefault + else + # get the response from the user + read myresponse + myresponse=$(tolower "$myresponse") + fi # Check to see if the user accepts the default if [ -z "$myresponse" ]; then diff --git a/scripts/install/install-image-existing b/scripts/install/install-image-existing index 39299507..2281eae3 100755 --- a/scripts/install/install-image-existing +++ b/scripts/install/install-image-existing @@ -57,7 +57,11 @@ NEWVER=`dpkg -l --root=${CD_SQUASH_ROOT} | grep "^.. vyatta-version " | awk '{p NEWNAME=$NEWVER echo -n "What would you like to name this image? [$NEWNAME]: " -read response +if [ "$VYATTA_PROCESS_CLIENT" == "gui2_rest" ]; then + response=$NEWNAME +else + read response +fi if [ -n "$response" ]; then badchars=`echo $response | sed -e 's/[a-zA-Z0-9\.\_+-]//g'` if [ -n "$badchars" ]; then diff --git a/scripts/install/install-image-new b/scripts/install/install-image-new index c669da8e..3097392a 100755 --- a/scripts/install/install-image-new +++ b/scripts/install/install-image-new @@ -31,7 +31,11 @@ if [ -z "$image_name" ]; then fi echo -n "What would you like to name this image? [$image_name]: " -read response +if [ "$VYATTA_PROCESS_CLIENT" == "gui2_rest" ]; then + response=$NEWNAME +else + read response +fi if [ -n "$response" ]; then badchars=`echo $response | sed -e 's/[a-zA-Z0-9\.\_+-]//g'` if [ -n "$badchars" ]; then -- cgit v1.2.3 From 4d7fedd8dca4022c1266e16796fd03132d7d2634 Mon Sep 17 00:00:00 2001 From: Mohit Mehta Date: Wed, 11 May 2011 11:30:45 -0700 Subject: Fix Bug 7012 make /config available with init-floppy --- debian/vyatta-cfg-system.postinst.in | 2 +- scripts/init-floppy | 29 ++++++++++++++++++++++------- 2 files changed, 23 insertions(+), 8 deletions(-) (limited to 'scripts') diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in index d9663245..177dee6d 100644 --- a/debian/vyatta-cfg-system.postinst.in +++ b/debian/vyatta-cfg-system.postinst.in @@ -193,7 +193,7 @@ then # Do not remove the following call to vyatta-postconfig-bootup.script. # Any boot time workarounds should be put in script below so that they # get preserved for the new image during image upgrade. -/opt/vyatta/etc/config/scripts/vyatta-postconfig-bootup.script +sudo /opt/vyatta/etc/config/scripts/vyatta-postconfig-bootup.script EOF sh -c "sed -i -e '/exit 0/d' /etc/rc.local" cat <>/etc/rc.local diff --git a/scripts/init-floppy b/scripts/init-floppy index 16e12915..9f5301d8 100755 --- a/scripts/init-floppy +++ b/scripts/init-floppy @@ -64,7 +64,7 @@ config_notice="\rSaving config... \c" config__error="\rError: Couldn't save config in $fd/config/config.boot" bind___notice="\rRedirecting config directory...\c" bind____error="\rError: redirect to floppy" -saved__notice="\rYour configuration was saved in: $fd/config/config.boot" +saved__notice="\rYour configuration directory was saved to: $fd/config" mkdir -p $fd @@ -92,16 +92,31 @@ echo "$mount__notice" /bin/mount /dev/fd0 $fd -t ext2 -o sync,noatime,noexec,nosuid,nodev &>/dev/null || \ failure "$mount___error" -/bin/mkdir $fd/config -/bin/chmod 777 $fd/config - -echo "$config_notice" -${vyatta_sbindir}/vyatta-save-config.pl $fd/config/config.boot &>/dev/null || \ - failure "$config__error" +# +# Check to make sure we have enough space to copy the config dir +# +fd_space_avail=`df -k $fd | tail -1 | awk '{ print $4 }'` +space_needed=`du -s ${vyatta_sysconfdir}/config | awk '{ print $1 }'` + +if [ $fd_space_avail -gt $space_needed ]; then + echo "$config_notice" + /bin/mkdir $fd/config + /usr/bin/find ${vyatta_sysconfdir}/config -maxdepth 1 -mindepth 1 \ + -exec /bin/cp '-a' '{}' "$fd/config" ';' + /bin/chgrp -R vyattacfg $fd/config + /bin/chmod -R 775 $fd/config +else + echo 'Not enough space to save current configuration directory' + failure "$config__error" +fi echo "$bind___notice" /bin/mount -o bind $fd/config ${vyatta_sysconfdir}/config &>/dev/null || \ failure "$bind____error" +# also, bind mount config directory to /config +/bin/mkdir -p /config +/bin/mount -o bind $fd/config /config &>/dev/null || \ + failure "$bind____error" echo "$saved__notice" -- cgit v1.2.3 From a00c48447392f8ce7902b6c2f99269cf56340eea Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Thu, 12 May 2011 13:57:34 -0700 Subject: Remove unused parts of rl-system.init The script was looking up hostname and setting $LOGFILE, but these parts are never used in current code. --- scripts/rl-system.init | 9 --------- 1 file changed, 9 deletions(-) (limited to 'scripts') diff --git a/scripts/rl-system.init b/scripts/rl-system.init index 115bbc7d..d6f974f7 100755 --- a/scripts/rl-system.init +++ b/scripts/rl-system.init @@ -27,7 +27,6 @@ source /etc/default/vyatta : ${vyatta_bindir:=${vyatta_prefix}/bin} : ${vyatta_sbindir:=${vyatta_prefix}/sbin} : ${vyatta_sysconfdir:=${vyatta_prefix}/etc} -: ${hostname:=`hostname -s`} [[ $PATH == *${vyatta_bindir}* ]] || PATH+=:${vyatta_bindir} [[ $PATH == *${vyatta_sbindir}* ]] || PATH+=:${vyatta_sbindir} @@ -40,14 +39,6 @@ export DEBIAN_FRONTEND=noninteractive ## BOOTFILE is provided by ofr.init : ${BOOTFILE:=$prefix/etc/config/config.boot} -if [ -z "$LOGFILE" ] ; then - if touch /var/log/messages &> /dev/null ; then - LOGFILE=/var/log/messages - else - LOGFILE=/dev/null - fi -fi - syslog () { logger -p user.warning -t "$progname" "$*" -- cgit v1.2.3