Merge branch 'master' of bcornec/mageia4arm into master
This commit is contained in:
commit
3c3922f99a
@ -68,7 +68,7 @@ function help()
|
||||
echo "--build-path Path to the build directory of the image of Mageia $MAGEIA_VERSION"
|
||||
echo "--target target system (for now rpi, odroid)"
|
||||
echo "--target-version version of the target (0, 1, 2, 3 for rpi, 3 or 4 for odroid)"
|
||||
echo "--config Path to config files"
|
||||
echo "--config Path to config files (rpi1 rpi2 rpi3 rpi3+ xu4)"
|
||||
echo "--bootfs filesystem of boot partition (ext4 or vfat) default: ext4"
|
||||
echo "--nonfree activate nonfree repos"
|
||||
echo "--tainted activate tainted repos"
|
||||
@ -780,9 +780,11 @@ do
|
||||
;;
|
||||
--nonfree)
|
||||
NONFREE_P=1
|
||||
shift
|
||||
;;
|
||||
--tainted)
|
||||
TAINTED_P=1
|
||||
shift
|
||||
;;
|
||||
--)
|
||||
shift
|
||||
@ -806,7 +808,7 @@ if ! [ -d "$CONFIG_PATH" ];then
|
||||
warning "You need now to modify the config file ($CONFIG_PATH/mageia4arm.cfg) and relaunch the script"
|
||||
exit 2
|
||||
else
|
||||
error( "Error: Can't continue without config file, exiting" )
|
||||
error "Error: Can't continue without config file, exiting"
|
||||
exit 3
|
||||
fi
|
||||
fi
|
||||
@ -823,9 +825,6 @@ fi
|
||||
exit 2
|
||||
fi
|
||||
fi
|
||||
else
|
||||
|
||||
fi
|
||||
|
||||
if ! [ -z "$IMAGE_SIZE_P" ];then
|
||||
IMAGE_SIZE=$IMAGE_SIZE_P
|
||||
|
Reference in New Issue
Block a user