diff options
| author | jbu <pullmoll@t-online.de> | 2015-05-08 07:06:26 +0200 |
|---|---|---|
| committer | jbu <pullmoll@t-online.de> | 2015-05-08 07:06:26 +0200 |
| commit | 944153192b98c6f2ba66d8e6a4a87602610ce626 (patch) | |
| tree | 02c116d4553d2d922874d5e0ba5279968b6dfe32 /build-x86-images.sh.in | |
| parent | 929175a025254315fd0773d1af23943233616db8 (diff) | |
| download | hrmpf-944153192b98c6f2ba66d8e6a4a87602610ce626.tar.gz hrmpf-944153192b98c6f2ba66d8e6a4a87602610ce626.tar.xz hrmpf-944153192b98c6f2ba66d8e6a4a87602610ce626.zip | |
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
Diffstat (limited to 'build-x86-images.sh.in')
| -rw-r--r-- | build-x86-images.sh.in | 10 |
1 files changed, 5 insertions, 5 deletions
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 |