saad/minimal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Proper fix for the issue when no overlay bundles are defined in the main configuration file.

Browse Source
This commit is contained in:
Ivan Davidov 2017-12-28 04:59:34 +02:00
parent 52bf803742
commit 0fad4724da
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/09_generate_rootfs.sh
View File

@ -56,9 +56,9 @@ set -e
# Read the 'OVERLAY_LOCATION' property from '.config' # Read the 'OVERLAY_LOCATION' property from '.config'
OVERLAY_LOCATION=`read_property OVERLAY_LOCATION` OVERLAY_LOCATION=`read_property OVERLAY_LOCATION`
if [ "$OVERLAY_LOCATION" = "rootfs" \ if [ "$OVERLAY_LOCATION" = "rootfs" ] && \
-a -d $OVERLAY_ROOTFS \ [ -d $OVERLAY_ROOTFS ] && \
-a ! "`ls -A $OVERLAY_ROOTFS`" = "" ] ; then [ ! "`ls -A $OVERLAY_ROOTFS`" = "" ] ; then
echo "Merging overlay software in rootfs." echo "Merging overlay software in rootfs."

18
src/11_generate_overlay.sh
View File

@ -21,11 +21,11 @@ OVERLAY_TYPE=`read_property OVERLAY_TYPE`
# Read the 'OVERLAY_LOCATION' property from '.config' # Read the 'OVERLAY_LOCATION' property from '.config'
OVERLAY_LOCATION=`read_property OVERLAY_LOCATION` OVERLAY_LOCATION=`read_property OVERLAY_LOCATION`
if [ "$OVERLAY_LOCATION" = "iso" \ if [ "$OVERLAY_LOCATION" = "iso" ] && \
-a "$OVERLAY_TYPE" = "sparse" \ [ "$OVERLAY_TYPE" = "sparse" ] && \
-a -d $OVERLAY_ROOTFS \ [ -d $OVERLAY_ROOTFS ] && \
-a ! "`ls -A $OVERLAY_ROOTFS`" = "" \ [ ! "`ls -A $OVERLAY_ROOTFS`" = "" ] && \
-a "$(id -u)" = "0" ] ; then [ "$(id -u)" = "0" ] ; then
# Use sparse file as storage place. The above check guarantees that the whole # Use sparse file as storage place. The above check guarantees that the whole
# script is executed with root permissions or otherwise this block is skipped. # script is executed with root permissions or otherwise this block is skipped.
@ -73,10 +73,10 @@ if [ "$OVERLAY_LOCATION" = "iso" \
# Detach the loop device since we no longer need it. # Detach the loop device since we no longer need it.
$BUSYBOX losetup -d $LOOP_DEVICE $BUSYBOX losetup -d $LOOP_DEVICE
elif [ "$OVERLAY_LOCATION" = "iso" \ elif [ "$OVERLAY_LOCATION" = "iso" ] && \
-a "$OVERLAY_TYPE" = "folder" \ [ "$OVERLAY_TYPE" = "folder" ] && \
-a -d $OVERLAY_ROOTFS \ [ -d $OVERLAY_ROOTFS ] && \
-a ! "`ls -A $OVERLAY_ROOTFS`" = "" ] ; then [ ! "`ls -A $OVERLAY_ROOTFS`" = "" ] ; then
# Use normal folder structure for overlay. All files and folders located in # Use normal folder structure for overlay. All files and folders located in
# the folder 'minimal_overlay' will be merged with the root folder on boot. # the folder 'minimal_overlay' will be merged with the root folder on boot.

4
src/15_generate_image.sh
View File

@ -21,8 +21,8 @@ else
exit 1 exit 1
fi fi
if [ -d $OVERLAY_ROOTFS \ if [ -d $OVERLAY_ROOTFS ] && \
-a ! "`ls -A $OVERLAY_ROOTFS`" = "" ] ; then [ ! "`ls -A $OVERLAY_ROOTFS`" = "" ] ; then
echo "Merging overlay software in image." echo "Merging overlay software in image."