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
This commit is contained in:
jbu
2015-05-08 07:06:26 +02:00
parent 929175a025
commit 944153192b
2 changed files with 18 additions and 17 deletions

View File

@@ -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