X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=autoconfig.functions;h=55808124d002de808e841712c044ff8cb044df0d;hp=7fdb4beb731bfdca5b5f8d9b5c82c9a3df5459ce;hb=6992b6808072f97e3b7870dec51c5fc19e55aa91;hpb=b067eaa3953382530af6ee343de4a360e3eabec4 diff --git a/autoconfig.functions b/autoconfig.functions index 7fdb4be..5580812 100755 --- a/autoconfig.functions +++ b/autoconfig.functions @@ -1721,7 +1721,7 @@ if checkbootparam 'debs' ; then # backwards compatibility: if no path is given get debs from debs/ DEBS="debs/$DEBS" fi - einfo "Tring to install debian package(s) ${DEBS}" + einfo "Trying to install Debian package(s) ${DEBS}" DEBS="$(eval echo ${DCSDIR}/$DEBS)" dpkg -i $DEBS ; eend $? fi @@ -2265,9 +2265,38 @@ if $VIRTUALBOX ; then eend $? einfo "Starting VBoxService." - VBoxService >/dev/null & + VBoxService >/dev/null eend $? + local vbox_automation='/media/sf_automation' + if checkbootparam 'vbautomation'; then + vbox_automation="$(getbootparam 'vbautomation' 2>>$DEBUG)" + fi + + local distri="$(getbootparam 'distri' 2>>$DEBUG)" + [ -n "$distri" ] || distri='grml' + + if [ -d "${vbox_automation}" ] ; then + einfo "Found shared folders automation directory $vbox_automation" + eend 0 + + eindent + if checkbootparam 'novbautomation' ; then + einfo "Bootoption novbautomation found. Disabling automation script execution." + eend 0 + else + if ! [ -x "${vbox_automation}/${distri}" ] ; then + ewarn "Couldn't find an automation script named ${vbox_automation}/${distri}" + eend 1 + else + einfo "Executing '${vbox_automation}/${distri}' now:" + "${vbox_automation}/${distri}" + eend $? + fi + fi + eoutdent + fi + eoutdent fi fi