root/nix-tools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[util-iso] read Packages-Root

Browse source
This commit is contained in:
udeved 2015-12-18 03:33:17 +01:00
parent 332de986bf
commit 27ff184493
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/util-iso.sh
View file

@ -474,7 +474,7 @@ check_custom_pacman_conf(){
# $1: profile # $1: profile
check_profile_sanity(){ check_profile_sanity(){
local keyfiles=("$1/profile.conf" "$1/mkinitcpio.conf" "$1/Packages" "$1/Packages-Livecd") local keyfiles=("$1/profile.conf" "$1/mkinitcpio.conf" "$1/Packages-Root" "$1/Packages-Livecd")
local keydirs=("$1/root-overlay" "$1/live-overlay" "$1/isolinux") local keydirs=("$1/root-overlay" "$1/live-overlay" "$1/isolinux")
local has_keyfiles=false has_keydirs=false local has_keyfiles=false has_keydirs=false
for f in ${keyfiles[@]}; do for f in ${keyfiles[@]}; do
@ -533,7 +533,7 @@ eval_custom(){
local files=$(ls $1/Packages*) name local files=$(ls $1/Packages*) name
for f in ${files[@]};do for f in ${files[@]};do
case $f in case $f in
$1/Packages|$1/Packages-Livecd|$1/Packages-Mhwd) continue ;; $1/Packages-Root|$1/Packages-Livecd|$1/Packages-Mhwd) continue ;;
*) packages_custom="$f" ;; *) packages_custom="$f" ;;
esac esac
done done
@ -574,7 +574,7 @@ compress_images(){
build_images(){ build_images(){
local timer=$(get_timer) local timer=$(get_timer)
load_pkgs "${profile_dir}/Packages" load_pkgs "${profile_dir}/Packages-Root"
make_image_root make_image_root
if [[ -f "${packages_custom}" ]] ; then if [[ -f "${packages_custom}" ]] ; then
load_pkgs "${packages_custom}" load_pkgs "${packages_custom}"