From 03e324c296efa08997831dbeac6238cb62e8f80b Mon Sep 17 00:00:00 2001 From: Ivan Davidov Date: Sat, 5 Aug 2017 00:52:43 +0300 Subject: [PATCH] Updated software versions. The 'nweb' bundle fails on Ubuntu. --- src/.config | 9 ++++----- src/minimal_rootfs/etc/04_bootscript.sh | 11 +++++++---- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/.config b/src/.config index a1c7bb16a..c96b839f1 100644 --- a/src/.config +++ b/src/.config @@ -11,19 +11,19 @@ # # http://kernel.org # -KERNEL_SOURCE_URL=http://kernel.org/pub/linux/kernel/v4.x/linux-4.9.33.tar.xz +KERNEL_SOURCE_URL=http://kernel.org/pub/linux/kernel/v4.x/linux-4.12.4.tar.xz # You can find the latest GNU libc source bundles here: # # http://gnu.org/software/libc # -GLIBC_SOURCE_URL=http://ftp.gnu.org/gnu/glibc/glibc-2.25.tar.bz2 +GLIBC_SOURCE_URL=http://ftp.gnu.org/gnu/glibc/glibc-2.26.tar.bz2 # You can find the latest BusyBox source bundles here: # # http://busybox.net # -BUSYBOX_SOURCE_URL=http://busybox.net/downloads/busybox-1.26.2.tar.bz2 +BUSYBOX_SOURCE_URL=http://busybox.net/downloads/busybox-1.27.1.tar.bz2 # You can find the latest Syslinux source bundles here: # @@ -175,8 +175,7 @@ COPY_SOURCE_ISO=true # # Refer to the README file for more information. # -#OVERLAY_BUNDLES=glibc_full,links,dropbear,java,felix,mll_utils,lua,static_get,cf_cli -#OVERLAY_BUNDLES=cf_cli +#OVERLAY_BUNDLES=glibc_full,links,dropbear,java,felix,mll_utils,lua,static_get,cf_cli,nweb,dhcp OVERLAY_BUNDLES=nweb,dhcp # This property enables the standard penguin boot logo in the upper left corner diff --git a/src/minimal_rootfs/etc/04_bootscript.sh b/src/minimal_rootfs/etc/04_bootscript.sh index 46d3bf588..7f96329b2 100755 --- a/src/minimal_rootfs/etc/04_bootscript.sh +++ b/src/minimal_rootfs/etc/04_bootscript.sh @@ -27,8 +27,11 @@ echo -e "Welcome to \\e[1mMinimal \\e[32mLinux \\e[31mLive\\e[0m (/sbin/init)" # Autorun functionality +if [ -d /etc/autorun ] ; then for AUTOSCRIPT in /etc/autorun/* -do - echo -e "Executing \\e[32m$AUTOSCRIPT\\e[0m in subshell." - sh $AUTOSCRIPT -done + do + echo -e "Executing \\e[32m$AUTOSCRIPT\\e[0m in subshell." + sh $AUTOSCRIPT + done +fi +