Commit 4bcafd97 authored by Pierre Schmitz's avatar Pierre Schmitz
Browse files

mkarchroot: code cleanup

parent 1f0374d8
Loading
Loading
Loading
Loading
+6 −14
Original line number Diff line number Diff line
@@ -171,23 +171,15 @@ else
		pacargs+=("--config=${pac_conf}")
	fi

	if (( $# != 0 )); then
	if [[ $FORCE = 'y' ]]; then
		pacargs+=("--force")
	fi
	if ! pacstrap -GMcd "${working_dir}" "${pacargs[@]}" "$@"; then
		die 'Failed to install all packages'
	fi
	fi

	if [[ -d "${working_dir}/lib/modules" ]]; then
		chroot_run "${working_dir}" ldconfig
	fi

	if [[ -e "${working_dir}/etc/locale.gen" ]]; then
		sed -i 's@^#\(en_US\|de_DE\)\(\.UTF-8\)@\1\2@' "${working_dir}/etc/locale.gen"
	printf '%s.UTF-8 UTF-8\n' en_US de_DE > "${working_dir}/etc/locale.gen"
	chroot_run "${working_dir}" locale-gen
	fi
	echo 'LANG=C' > "${working_dir}/etc/locale.conf"

	copy_hostconf