root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

[util-iso] load new Packages-Mhwd files name instead of Packages-Xorg

Browse source
This commit is contained in:
udeved 2015-07-04 10:54:56 +02:00
parent 5abfdd4442
commit f47e96bf6e
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/util-iso-image.sh
View file

@ -284,7 +284,7 @@ configure_displaymanager(){
}
# $1: chroot
configure_xorg_drivers(){
configure_mhwd_drivers(){
# Disable Catalyst if not present
if [ -z "$(ls $1/opt/livecd/pkgs/ | grep catalyst-utils 2> /dev/null)" ]; then
msg2 "Disabling Catalyst driver"

24
lib/util-iso.sh
View file

@ -109,8 +109,8 @@ copy_livecd_helpers(){
write_profile_conf_entries $1
}
copy_cache_xorg(){
msg2 "Copying xorg package cache ..."
copy_cache_mhwd(){
msg2 "Copying mhwd package cache ..."
rsync -v --files-from="${work_dir}/pkgs-image/cache-packages.txt" /var/cache/pacman/pkg "${work_dir}/pkgs-image/opt/livecd/pkgs"
}
@ -294,7 +294,7 @@ make_image_livecd() {
fi
}
make_image_xorg() {
make_image_mhwd() {
if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then
msg "Prepare [pkgs-image]"
local path="${work_dir}/pkgs-image"
@ -313,15 +313,15 @@ make_image_xorg() {
die "Exit ${FUNCNAME}"
fi
copy_cache_xorg
copy_cache_mhwd
if [[ -n "${packages_cleanup}" ]]; then
for xorg_clean in ${packages_cleanup}; do
rm ${path}/opt/livecd/pkgs/${xorg_clean}
for mhwd_clean in ${packages_cleanup}; do
rm ${path}/opt/livecd/pkgs/${mhwd_clean}
done
fi
cp ${PKGDATADIR}/pacman-gfx.conf ${path}/opt/livecd
make_repo "${path}/opt/livecd/pkgs/gfx-pkgs" "${path}/opt/livecd/pkgs"
configure_xorg_drivers "${path}"
configure_mhwd_drivers "${path}"
umount_image "${path}"
@ -535,7 +535,7 @@ load_pkgs(){
| sed "$_kernel" \
| sed "$_clean")
if [[ $1 == 'Packages-Xorg' ]]; then
if [[ $1 == 'Packages-Mhwd' ]]; then
packages_cleanup=$(sed "$_com_rm" "$1" \
| grep cleanup \
| sed "$_purge_rm" \
@ -583,7 +583,7 @@ load_profile(){
local files=$(ls Packages*)
for f in ${files[@]};do
case $f in
Packages|Packages-Livecd|Packages-Xorg) continue ;;
Packages|Packages-Livecd|Packages-Mhwd) continue ;;
*) packages_custom="$f" ;;
esac
done
@ -618,9 +618,9 @@ build_images(){
load_pkgs "Packages-Livecd"
make_image_livecd
fi
if [[ -f Packages-Xorg ]] ; then
load_pkgs 'Packages-Xorg'
make_image_xorg
if [[ -f Packages-Mhwd ]] ; then
load_pkgs 'Packages-Mhwd'
make_image_mhwd
fi
make_image_boot
if [[ "${arch}" == "x86_64" ]]; then