Merge branch 'master' into stable-0.13.x

.gitignore

@@ -3,3 +3,4 @@
 *.tar.xz
 .kateproject.d
 data/misc
+.project

.project

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>manjaro-tools</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>

README.md

@@ -98,10 +98,10 @@ overriding
 # dist_name="Manjaro"
 
 # the dist release; default: auto
-# dist_release=16.06
+# dist_release=16.10
 
 # the codename; defaults to value sourced from /etc/lsb-release
-# dist_codename="Daniella"
+# dist_codename="Fringilla"
 
 # the branding; default: auto
 # dist_branding="MJRO"

lib/util-iso-calamares.sh

@@ -224,6 +224,7 @@ write_settings_conf(){
 	echo "  - localecfg" >> "$conf"
 	echo "  - luksopenswaphookcfg" >> "$conf"
 	echo "  - luksbootkeyfile" >> "$conf"
+	${plymouth_boot} && echo "  - plymouthcfg" >> "$conf"
 	echo "  - initcpiocfg" >> "$conf"
 	echo "  - initcpio" >> "$conf"
 	echo "  - users" >> "$conf"
@@ -346,10 +347,23 @@ write_grubcfg_conf(){
 	echo "    GRUB_DISABLE_SUBMENU: true" >> "$conf"
 	echo '    GRUB_TERMINAL_OUTPUT: "console"' >> "$conf"
 	echo "    GRUB_DISABLE_RECOVERY: true" >> "$conf"
-	if ${plymouth_boot};then
+}
-		echo '' >> "$conf"
+
-		echo "plymouth_theme: ${plymouth_theme}" >> "$conf"
+write_plymouthcfg_conf(){
-	fi
+	local conf="$1/etc/calamares/modules/plymouthcfg.conf"
+	msg2 "Writing %s ..." "${conf##*/}"
+	echo "---" > "$conf"
+	echo "plymouth_theme: ${plymouth_theme}" >> "$conf"
+}
+
+write_locale_conf(){
+	local conf="$1/etc/calamares/modules/locale.conf"
+	msg2 "Writing %s ..." "${conf##*/}"
+	echo "---" > "$conf"
+	echo "region: America" >> "$conf"
+	echo "zone: New_York" >> "$conf"
+	echo "localeGenPath: /etc/locale.gen" >> "$conf"
+	echo "geoipUrl: freegeoip.net" >> "$conf"
 }
 
 configure_calamares(){
@@ -359,6 +373,8 @@ configure_calamares(){
 
 	write_settings_conf "$1"
 
+	write_locale_conf "$1"
+
 	write_welcome_conf "$1"
 
 	write_packages_conf "$1"
@@ -379,6 +395,8 @@ configure_calamares(){
 
 	${netinstall} && write_netinstall_conf "$1"
 
+	${plymouth_boot} && write_plymouthcfg_conf "$1"
+
 	write_chrootcfg_conf "$1"
 
 	write_postcfg_conf "$1"

lib/util-iso-image.sh

@@ -237,7 +237,6 @@ configure_live_image(){
 	msg "Configuring [live-image]"
 	detect_desktop_env "$1"
 	configure_hosts "$1"
-	configure_plymouth "$1"
 	configure_lsb "$1"
 	configure_mhwd "$1"
 	configure_system "$1"

lib/util-iso.sh

@@ -320,6 +320,7 @@ make_image_boot() {
 		mkdir -p ${path}
 
 		mount_image_select "${path}"
+		configure_plymouth "${path}"
 
 		copy_initcpio "${profile_dir}" "${path}"
 
@@ -749,7 +750,7 @@ load_profile(){
 	iso_dir="${cache_dir_iso}/${edition}/${dist_release}/${profile}"
 
 	prepare_dir "${iso_dir}"
-	chown "${OWNER}:${OWNER}" "${iso_dir}"
+	chown "${OWNER}:$(id --group ${OWNER})" "${iso_dir}"
 
 	mktorrent_args=(-v -p -l ${piece_size} -a ${tracker_url} -w $(gen_webseed))
 }

lib/util.sh

@@ -377,10 +377,10 @@ check_profile_vars(){
 
 get_svc(){
 	local service=${displaymanager}
-	if  [[ $service != "sddm" ]] || \
+	case $service in
-		[[ $service != "lxdm" ]];then
+		'sddm'|'lxdm') service="$service" ;;
-		${plymouth_boot} && service="$service-plymouth"
+		*) ${plymouth_boot} && service="$service-plymouth" ;;
-	fi
+	esac
 	echo $service
 }