From: Frank Brehm Date: Thu, 24 Aug 2023 10:35:33 +0000 (+0200) Subject: Renaming snippets. X-Git-Tag: 3.0.0^2~38 X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=9b587779d9c535e74a2d2b7c08a2aed295018ce4;p=pixelpark%2Fcreate-vmware-tpl.git Renaming snippets. --- diff --git a/kickstart/profile.rhel-9.2.develop.ks b/kickstart/profile.rhel-9.2.develop.ks index 944eb5e..d9930b4 100644 --- a/kickstart/profile.rhel-9.2.develop.ks +++ b/kickstart/profile.rhel-9.2.develop.ks @@ -324,7 +324,7 @@ echo echo "Using snippet $vimrc_snippet" $SNIPPET($vimrc_snippet) -#set $pkgs_snippet = "per_status/" + $SYSTEM_STATUS + "/tpl.255.pkgs-el9.sh" +#set $pkgs_snippet = "per_status/" + $SYSTEM_STATUS + "/tpl.250.pkgs-el9.sh" echo echo "Using snippet $pkgs_snippet" $SNIPPET($pkgs_snippet) diff --git a/kickstart/template-centos7.ks b/kickstart/template-centos7.ks index f1a112f..481b137 100644 --- a/kickstart/template-centos7.ks +++ b/kickstart/template-centos7.ks @@ -237,7 +237,7 @@ echo echo "Using snippet $vimrc_snippet" $SNIPPET($vimrc_snippet) -#set $pkgs_snippet = "per_status/" + $SYSTEM_STATUS + "/tpl.240.pkgs-el7.sh" +#set $pkgs_snippet = "per_status/" + $SYSTEM_STATUS + "/tpl.250.pkgs-el7.sh" echo echo "Using snippet $pkgs_snippet" $SNIPPET($pkgs_snippet) diff --git a/kickstart/template-centos8.ks b/kickstart/template-centos8.ks index 40330da..c497c3f 100644 --- a/kickstart/template-centos8.ks +++ b/kickstart/template-centos8.ks @@ -240,7 +240,7 @@ echo echo "Using snippet $vimrc_snippet" $SNIPPET($vimrc_snippet) -#set $pkgs_snippet = "per_status/" + $SYSTEM_STATUS + "/tpl.250.pkgs-centos8.sh" +#set $pkgs_snippet = "per_status/" + $SYSTEM_STATUS + "/tpl.250.pkgs-el8.sh" echo echo "Using snippet $pkgs_snippet" $SNIPPET($pkgs_snippet) diff --git a/kickstart/template-oel7.ks b/kickstart/template-oel7.ks index daaf470..5b48bf2 100644 --- a/kickstart/template-oel7.ks +++ b/kickstart/template-oel7.ks @@ -237,7 +237,7 @@ echo echo "Using snippet $vimrc_snippet" $SNIPPET($vimrc_snippet) -#set $pkgs_snippet = "per_status/" + $SYSTEM_STATUS + "/tpl.240.pkgs-el7.sh" +#set $pkgs_snippet = "per_status/" + $SYSTEM_STATUS + "/tpl.250.pkgs-el7.sh" echo echo "Using snippet $pkgs_snippet" $SNIPPET($pkgs_snippet) diff --git a/snippets/tpl.240.pkgs-el7.sh b/snippets/tpl.240.pkgs-el7.sh deleted file mode 100644 index 80129e7..0000000 --- a/snippets/tpl.240.pkgs-el7.sh +++ /dev/null @@ -1,39 +0,0 @@ -## !/bin/bash -#raw - -#----------------------------------------------------------- -install_pkgs_el7() { - - echo -e "\e[0Ksection_start:$( date +%s ):ks_install_pkgs_el7[collapsed=true]\r\e[0KInstalling additional packages ..." - echo - echo "${HASH_LINE}" - echo "Calling install_pkgs_el7() ..." - echo - echo - log "Installing additional packages ..." - echo - - local -a pkgs_add=('colordiff' 'p7zip' 'screen') - local -a pkgs_remove=('nfs*' 'rpcbind') - - echo "Installing packages: ${pkgs_add[*]}" - yum install -y "${pkgs_add[@]}" - - echo - echo "Removing packages: ${pkgs_remove[*]}" - yum remove -y "${pkgs_remove[@]}" - - echo - echo "Creating /etc/gitconfig ..." - cat <<-EOF >/etc/gitconfig - [color] - ui = true - EOF - - echo -e "\e[0Ksection_end:$( date +%s ):ks_install_pkgs_el7\r\e[0K" -} - -install_pkgs_el7 - -#end raw -## vim: ts=4 et list diff --git a/snippets/tpl.250.pkgs-el7.sh b/snippets/tpl.250.pkgs-el7.sh new file mode 100644 index 0000000..dd10052 --- /dev/null +++ b/snippets/tpl.250.pkgs-el7.sh @@ -0,0 +1,39 @@ +## !/bin/bash +#raw + +#----------------------------------------------------------- +install_pkgs_el7() { + + echo -e "\e[0Ksection_start:$( date +%s ):ks_install_pkgs_el7[collapsed=true]\r\e[0KInstalling additional packages ..." + echo + echo "${HASH_LINE}" + echo "Calling install_pkgs_el7() ..." + echo + echo + log "Installing additional packages ..." + echo + + local -a pkgs_add=('colordiff' 'git' 'p7zip' 'screen') + local -a pkgs_remove=('nfs*' 'rpcbind') + + echo "Installing packages: ${pkgs_add[*]}" + yum install -y "${pkgs_add[@]}" + + echo + echo "Removing packages: ${pkgs_remove[*]}" + yum remove -y "${pkgs_remove[@]}" + + echo + echo "Creating /etc/gitconfig ..." + cat <<-EOF >/etc/gitconfig + [color] + ui = true + EOF + + echo -e "\e[0Ksection_end:$( date +%s ):ks_install_pkgs_el7\r\e[0K" +} + +install_pkgs_el7 + +#end raw +## vim: ts=4 et list diff --git a/snippets/tpl.250.pkgs-el9.sh b/snippets/tpl.250.pkgs-el9.sh new file mode 100644 index 0000000..711b4d7 --- /dev/null +++ b/snippets/tpl.250.pkgs-el9.sh @@ -0,0 +1,38 @@ +## !/bin/bash +#raw + +#----------------------------------------------------------- +install_pkgs_el9() { + + echo -e "\e[0Ksection_start:$( date +%s ):ks_install_pkgs_el9[collapsed=true]\r\e[0KInstalling additional packages from EPEL ..." + echo + echo "${HASH_LINE}" + echo "Calling install_pkgs_el9() ..." + echo + + local -a pkgs_add=('p7zip' 'screen') + local -a pkgs_remove=() + + if [[ "${#pkgs_add[*]}" -gt 0 ]] ; then + echo + log "Installing additional packages from EPEL ..." + echo + echo "Installing packages: ${pkgs_add[*]}" + dnf install -y "${pkgs_add[@]}" + fi + + if [[ "${#pkgs_remove[*]}" -gt 0 ]] ; then + echo + log "Removing pointless packages ..." + echo + echo "Removing packages: ${pkgs_remove[*]}" + dnf remove -y "${pkgs_remove[@]}" + fi + + echo -e "\e[0Ksection_end:$( date +%s ):ks_install_pkgs_el9\r\e[0K" +} + +install_pkgs_el9 + +#end raw +## vim: ts=4 et list diff --git a/snippets/tpl.255.pkgs-el9.sh b/snippets/tpl.255.pkgs-el9.sh deleted file mode 100644 index 711b4d7..0000000 --- a/snippets/tpl.255.pkgs-el9.sh +++ /dev/null @@ -1,38 +0,0 @@ -## !/bin/bash -#raw - -#----------------------------------------------------------- -install_pkgs_el9() { - - echo -e "\e[0Ksection_start:$( date +%s ):ks_install_pkgs_el9[collapsed=true]\r\e[0KInstalling additional packages from EPEL ..." - echo - echo "${HASH_LINE}" - echo "Calling install_pkgs_el9() ..." - echo - - local -a pkgs_add=('p7zip' 'screen') - local -a pkgs_remove=() - - if [[ "${#pkgs_add[*]}" -gt 0 ]] ; then - echo - log "Installing additional packages from EPEL ..." - echo - echo "Installing packages: ${pkgs_add[*]}" - dnf install -y "${pkgs_add[@]}" - fi - - if [[ "${#pkgs_remove[*]}" -gt 0 ]] ; then - echo - log "Removing pointless packages ..." - echo - echo "Removing packages: ${pkgs_remove[*]}" - dnf remove -y "${pkgs_remove[@]}" - fi - - echo -e "\e[0Ksection_end:$( date +%s ):ks_install_pkgs_el9\r\e[0K" -} - -install_pkgs_el9 - -#end raw -## vim: ts=4 et list