[arch-releng] [PATCH] [archiso2dual] Check if is a core.iso before exec core_* functions
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> --- archiso2dual/archiso2dual | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/archiso2dual/archiso2dual b/archiso2dual/archiso2dual index 0654602..6f28072 100755 --- a/archiso2dual/archiso2dual +++ b/archiso2dual/archiso2dual @@ -150,6 +150,15 @@ core_pkgs_extract() { done } +check_if_core_medium() { + echo "Executing: ${FUNCNAME}" + if [ -f $work_dir/iso/i686/core-pkgs.sqfs -a -f $work_dir/iso/x86_64/core-pkgs.sqfs ]; then + return "yes" + else + return "no" + fi +} + root_image_extract() { echo "Executing: ${FUNCNAME}" for _arch in i686 x86_64; do @@ -371,10 +380,14 @@ if [ ${profile_type} = "full" ] || [ ${profile_type} = "split" ]; then if [ ${profile_type} = "full" ]; then root_image_purge fi - core_pkgs_extract + if [ check_if_core_medium = "yes" ]; then + core_pkgs_extract + fi usrshare_make_image libmodules_make_image root_image_make_image - core_pkgs_make_image + if [ check_if_core_medium = "yes" ]; then + core_pkgs_make_image + fi fi make_iso -- 1.7.1.1
On 07/09/2010 06:13 PM, Gerardo Exequiel Pozzi wrote:
Signed-off-by: Gerardo Exequiel Pozzi<vmlinuz386@yahoo.com.ar> --- archiso2dual/archiso2dual | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/archiso2dual/archiso2dual b/archiso2dual/archiso2dual index 0654602..6f28072 100755 --- a/archiso2dual/archiso2dual +++ b/archiso2dual/archiso2dual @@ -150,6 +150,15 @@ core_pkgs_extract() { done }
+check_if_core_medium() { + echo "Executing: ${FUNCNAME}" + if [ -f $work_dir/iso/i686/core-pkgs.sqfs -a -f $work_dir/iso/x86_64/core-pkgs.sqfs ]; then + return "yes" + else + return "no" + fi +} + root_image_extract() { echo "Executing: ${FUNCNAME}" for _arch in i686 x86_64; do @@ -371,10 +380,14 @@ if [ ${profile_type} = "full" ] || [ ${profile_type} = "split" ]; then if [ ${profile_type} = "full" ]; then root_image_purge fi - core_pkgs_extract + if [ check_if_core_medium = "yes" ]; then + core_pkgs_extract + fi usrshare_make_image libmodules_make_image root_image_make_image - core_pkgs_make_image + if [ check_if_core_medium = "yes" ]; then + core_pkgs_make_image + fi fi make_iso grrr ignore this! I sent wrong patch!!
-- Gerardo Exequiel Pozzi \cos^2\alpha + \sin^2\alpha = 1
participants (1)
-
Gerardo Exequiel Pozzi