From 944153192b98c6f2ba66d8e6a4a87602610ce626 Mon Sep 17 00:00:00 2001 From: jbu Date: Fri, 8 May 2015 07:06:26 +0200 Subject: void-mklive: Fixes for systems with md / lvm2 - Add quotes around $TARGET to allow for empty $1 in build-x86-images.sh - In installer.sh there was $part for md where it should have been $p - The list of md and lvm partitions should occur just once, thus move it out of the loop --- build-x86-images.sh.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'build-x86-images.sh.in') diff --git a/build-x86-images.sh.in b/build-x86-images.sh.in index 66d6656..b031a3d 100644 --- a/build-x86-images.sh.in +++ b/build-x86-images.sh.in @@ -24,27 +24,27 @@ readonly CINNAMON_PKGS="$X_PKGS lxdm cinnamon colord gnome-terminal gvfs-afc gvf [ ! -x mklive.sh ] && exit 0 -if [ -z "$TARGET" -o $TARGET = base ]; then +if [ -z "$TARGET" -o "$TARGET" = base ]; then if [ ! -e $BASE_IMG ]; then ./mklive.sh -o $BASE_IMG -p "$BASE_PKGS" $@ fi fi -if [ -z "$TARGET" -o $TARGET = e ]; then +if [ -z "$TARGET" -o "$TARGET" = e ]; then if [ ! -e $E_IMG ]; then ./mklive.sh -o $E_IMG -p "$E_PKGS" $@ fi fi -if [ -z "$TARGET" -o $TARGET = xfce ]; then +if [ -z "$TARGET" -o "$TARGET" = xfce ]; then if [ ! -e $XFCE_IMG ]; then ./mklive.sh -o $XFCE_IMG -p "$XFCE_PKGS" $@ fi fi -if [ -z "$TARGET" -o $TARGET = mate ]; then +if [ -z "$TARGET" -o "$TARGET" = mate ]; then if [ ! -e $MATE_IMG ]; then ./mklive.sh -o $MATE_IMG -p "$MATE_PKGS" $@ fi fi -if [ -z "$TARGET" -o $TARGET = cinnamon ]; then +if [ -z "$TARGET" -o "$TARGET" = cinnamon ]; then if [ ! -e $CINNAMON_IMG ]; then ./mklive.sh -o $CINNAMON_IMG -p "$CINNAMON_PKGS" $@ fi -- cgit 1.4.1