Removed YUM/DNF config rule from dockerize.

lavabit · Oct 29, 2023 · c2e5164 · c2e5164
1 parent e8a755a
commit c2e5164
Show file tree

Hide file tree

Showing 18 changed files with 2 additions and 98 deletions.
diff --git a/scripts/alma8/dockerize.sh b/scripts/alma8/dockerize.sh
@@ -15,13 +15,8 @@ systemctl --quiet is-active dbus.service && systemctl stop dbus.service
 systemctl --quiet is-active mariadb.service && systemctl stop mariadb.service
 systemctl --quiet is-active postfix.service && systemctl stop postfix.service
 
-awk '(NF==0&&!done){print "override_install_langs='$LANG'\ntsflags=nodocs";done=1}{print}' \
-    < /etc/dnf/dnf.conf > /etc/dnf/dnf.conf.new
-mv /etc/dnf/dnf.conf.new /etc/dnf/dnf.conf
 echo 'container' > /etc/dnf/vars/infra
 
-rm -f /usr/lib/locale/locale-archive
-
 # Setup the login message instructions.
 if [[ ! "$PACKER_BUILD_NAME" =~ ^generic-.*$ ]]; then
   printf "Magma Daemon Development Environment\nTo download and compile magma, just execute the magma-build.sh script.\n\n" > /etc/motd

diff --git a/scripts/alma9/dockerize.sh b/scripts/alma9/dockerize.sh
@@ -10,13 +10,8 @@ systemctl --quiet is-active mariadb.service && systemctl stop mariadb.service
 systemctl --quiet is-active postfix.service && systemctl stop postfix.service
 systemctl --quiet is-active dbus-broker.service && systemctl stop dbus-broker.service
 
-awk '(NF==0&&!done){print "override_install_langs='$LANG'\ntsflags=nodocs";done=1}{print}' \
-    < /etc/dnf/dnf.conf > /etc/dnf/dnf.conf.new
-mv /etc/dnf/dnf.conf.new /etc/dnf/dnf.conf
 echo 'container' > /etc/dnf/vars/infra
 
-rm -f /usr/lib/locale/locale-archive
-
 # Setup the login message instructions.
 if [[ ! "$PACKER_BUILD_NAME" =~ ^generic-.*$ ]]; then
   printf "Magma Daemon Development Environment\nTo download and compile magma, just execute the magma-build.sh script.\n\n" > /etc/motd

diff --git a/scripts/centos6/dockerize.sh b/scripts/centos6/dockerize.sh
@@ -10,16 +10,8 @@ service dbus stop
 service mysqld stop
 service postfix stop
 
-#LANG="en_US"
-#echo "%_install_lang $LANG" > /etc/rpm/macros.image-language-conf
-
-awk '(NF==0&&!done){print "override_install_langs='$LANG'\ntsflags=nodocs";done=1}{print}' \
-    < /etc/yum.conf > /etc/yum.conf.new
-mv /etc/yum.conf.new /etc/yum.conf
 echo 'container' > /etc/yum/vars/infra
 
-rm -f /usr/lib/locale/locale-archive
-
 # Setup the login message instructions.
 if [[ ! "$PACKER_BUILD_NAME" =~ ^generic-.*$ ]]; then
   printf "Magma Daemon Development Environment\nTo download and compile magma, just execute the magma-build.sh script.\n\n" > /etc/motd

diff --git a/scripts/centos7/dockerize.sh b/scripts/centos7/dockerize.sh
@@ -10,13 +10,8 @@ systemctl --quiet is-active dbus.service && systemctl stop dbus.service
 systemctl --quiet is-active mariadb.service && systemctl stop mariadb.service
 systemctl --quiet is-active postfix.service && systemctl stop postfix.service
 
-awk '(NF==0&&!done){print "override_install_langs='$LANG'\ntsflags=nodocs";done=1}{print}' \
-    < /etc/yum.conf > /etc/yum.conf.new
-mv /etc/yum.conf.new /etc/yum.conf
 echo 'container' > /etc/yum/vars/infra
 
-rm -f /usr/lib/locale/locale-archive
-
 # Setup the login message instructions.
 if [[ ! "$PACKER_BUILD_NAME" =~ ^generic-.*$ ]]; then
   printf "Magma Daemon Development Environment\nTo download and compile magma, just execute the magma-build.sh script.\n\n" > /etc/motd

diff --git a/scripts/centos8/dockerize.sh b/scripts/centos8/dockerize.sh
@@ -15,13 +15,8 @@ systemctl --quiet is-active dbus.service && systemctl stop dbus.service
 systemctl --quiet is-active mariadb.service && systemctl stop mariadb.service
 systemctl --quiet is-active postfix.service && systemctl stop postfix.service
 
-awk '(NF==0&&!done){print "override_install_langs='$LANG'\ntsflags=nodocs";done=1}{print}' \
-    < /etc/dnf/dnf.conf > /etc/dnf/dnf.conf.new
-mv /etc/dnf/dnf.conf.new /etc/dnf/dnf.conf
 echo 'container' > /etc/dnf/vars/infra
 
-rm -f /usr/lib/locale/locale-archive
-
 # Setup the login message instructions.
 if [[ ! "$PACKER_BUILD_NAME" =~ ^generic-.*$ ]]; then
   printf "Magma Daemon Development Environment\nTo download and compile magma, just execute the magma-build.sh script.\n\n" > /etc/motd

diff --git a/scripts/centos8s/dockerize.sh b/scripts/centos8s/dockerize.sh
@@ -10,13 +10,8 @@ systemctl --quiet is-active dbus.service && systemctl stop dbus.service
 systemctl --quiet is-active mariadb.service && systemctl stop mariadb.service
 systemctl --quiet is-active postfix.service && systemctl stop postfix.service
 
-awk '(NF==0&&!done){print "override_install_langs='$LANG'\ntsflags=nodocs";done=1}{print}' \
-    < /etc/dnf/dnf.conf > /etc/dnf/dnf.conf.new
-mv /etc/dnf/dnf.conf.new /etc/dnf/dnf.conf
 echo 'container' > /etc/dnf/vars/infra
 
-rm -f /usr/lib/locale/locale-archive
-
 # Setup the login message instructions.
 if [[ ! "$PACKER_BUILD_NAME" =~ ^generic-.*$ ]]; then
   printf "Magma Daemon Development Environment\nTo download and compile magma, just execute the magma-build.sh script.\n\n" > /etc/motd

diff --git a/scripts/centos9s/dockerize.sh b/scripts/centos9s/dockerize.sh
@@ -10,13 +10,8 @@ systemctl --quiet is-active mariadb.service && systemctl stop mariadb.service
 systemctl --quiet is-active postfix.service && systemctl stop postfix.service
 systemctl --quiet is-active dbus-broker.service && systemctl stop dbus-broker.service
 
-awk '(NF==0&&!done){print "override_install_langs='$LANG'\ntsflags=nodocs";done=1}{print}' \
-    < /etc/dnf/dnf.conf > /etc/dnf/dnf.conf.new
-mv /etc/dnf/dnf.conf.new /etc/dnf/dnf.conf
 echo 'container' > /etc/dnf/vars/infra
 
-rm -f /usr/lib/locale/locale-archive
-
 # Setup the login message instructions.
 if [[ ! "$PACKER_BUILD_NAME" =~ ^generic-.*$ ]]; then
   printf "Magma Daemon Development Environment\nTo download and compile magma, just execute the magma-build.sh script.\n\n" > /etc/motd

diff --git a/scripts/fedora38/dockerize.sh b/scripts/fedora38/dockerize.sh
@@ -9,13 +9,8 @@ systemctl --quiet is-active abrt.service && systemctl stop abrt.service
 systemctl --quiet is-active postfix.service && systemctl stop postfix.service
 systemctl --quiet is-active dbus-broker.service && systemctl stop dbus-broker.service
 
-awk '(NF==0&&!done){print "override_install_langs='$LANG'\ntsflags=nodocs";done=1}{print}' \
-    < /etc/dnf/dnf.conf > /etc/dnf/dnf.conf.new
-mv /etc/dnf/dnf.conf.new /etc/dnf/dnf.conf
 echo 'container' > /etc/dnf/vars/infra
 
-rm -f /usr/lib/locale/locale-archive
-
 # Setup the login message instructions.
 if [[ ! "$PACKER_BUILD_NAME" =~ ^generic-.*$ ]]; then
   printf "Magma Daemon Development Environment\nTo download and compile magma, just execute the magma-build.sh script.\n\n" > /etc/motd

diff --git a/scripts/oracle6/dockerize.sh b/scripts/oracle6/dockerize.sh
@@ -10,13 +10,8 @@ systemctl --quiet is-active dbus.service && systemctl stop dbus.service
 systemctl --quiet is-active mariadb.service && systemctl stop mariadb.service
 systemctl --quiet is-active postfix.service && systemctl stop postfix.service
 
-awk '(NF==0&&!done){print "override_install_langs='$LANG'\ntsflags=nodocs";done=1}{print}' \
-    < /etc/yum.conf > /etc/yum.conf.new
-mv /etc/yum.conf.new /etc/yum.conf
 echo 'container' > /etc/yum/vars/infra
 
-rm -f /usr/lib/locale/locale-archive
-
 # Setup the login message instructions.
 if [[ ! "$PACKER_BUILD_NAME" =~ ^generic-.*$ ]]; then
   printf "Magma Daemon Development Environment\nTo download and compile magma, just execute the magma-build.sh script.\n\n" > /etc/motd

diff --git a/scripts/oracle7/dockerize.sh b/scripts/oracle7/dockerize.sh
@@ -10,13 +10,8 @@ systemctl --quiet is-active dbus.service && systemctl stop dbus.service
 systemctl --quiet is-active mariadb.service && systemctl stop mariadb.service
 systemctl --quiet is-active postfix.service && systemctl stop postfix.service
 
-awk '(NF==0&&!done){print "override_install_langs='$LANG'\ntsflags=nodocs";done=1}{print}' \
-    < /etc/yum.conf > /etc/yum.conf.new
-mv /etc/yum.conf.new /etc/yum.conf
 echo 'container' > /etc/yum/vars/infra
 
-rm -f /usr/lib/locale/locale-archive
-
 # Setup the login message instructions.
 if [[ ! "$PACKER_BUILD_NAME" =~ ^generic-.*$ ]]; then
   printf "Magma Daemon Development Environment\nTo download and compile magma, just execute the magma-build.sh script.\n\n" > /etc/motd

diff --git a/scripts/oracle8/dockerize.sh b/scripts/oracle8/dockerize.sh
@@ -15,12 +15,7 @@ systemctl --quiet is-active dbus.service && systemctl stop dbus.service
 systemctl --quiet is-active mariadb.service && systemctl stop mariadb.service
 systemctl --quiet is-active postfix.service && systemctl stop postfix.service
 
-awk '(NF==0&&!done){print "override_install_langs='$LANG'\ntsflags=nodocs";done=1}{print}' \
-    < /etc/yum.conf > /etc/yum.conf.new
-mv /etc/yum.conf.new /etc/yum.conf
-echo 'container' > /etc/yum/vars/infra
-
-rm -f /usr/lib/locale/locale-archive
+echo 'container' > /etc/dnf/vars/infra
 
 # Setup the login message instructions.
 if [[ ! "$PACKER_BUILD_NAME" =~ ^generic-.*$ ]]; then

diff --git a/scripts/oracle9/dockerize.sh b/scripts/oracle9/dockerize.sh
@@ -10,12 +10,7 @@ systemctl --quiet is-active mariadb.service && systemctl stop mariadb.service
 systemctl --quiet is-active postfix.service && systemctl stop postfix.service
 systemctl --quiet is-active dbus-broker.service && systemctl stop dbus-broker.service
 
-awk '(NF==0&&!done){print "override_install_langs='$LANG'\ntsflags=nodocs";done=1}{print}' \
-    < /etc/yum.conf > /etc/yum.conf.new
-mv /etc/yum.conf.new /etc/yum.conf
-echo 'container' > /etc/yum/vars/infra
-
-rm -f /usr/lib/locale/locale-archive
+echo 'container' > /etc/dnf/vars/infra
 
 # Setup the login message instructions.
 if [[ ! "$PACKER_BUILD_NAME" =~ ^generic-.*$ ]]; then

diff --git a/scripts/rhel6/dockerize.sh b/scripts/rhel6/dockerize.sh
@@ -10,16 +10,8 @@ service dbus stop
 service mysqld stop
 service postfix stop
 
-#LANG="en_US"
-#echo "%_install_lang $LANG" > /etc/rpm/macros.image-language-conf
-
-awk '(NF==0&&!done){print "override_install_langs='$LANG'\ntsflags=nodocs";done=1}{print}' \
-    < /etc/yum.conf > /etc/yum.conf.new
-mv /etc/yum.conf.new /etc/yum.conf
 echo 'container' > /etc/yum/vars/infra
 
-rm -f /usr/lib/locale/locale-archive
-
 # Setup the login message instructions.
 if [[ ! "$PACKER_BUILD_NAME" =~ ^generic-.*$ ]]; then
   printf "Magma Daemon Development Environment\nTo download and compile magma, just execute the magma-build.sh script.\n\n" > /etc/motd

diff --git a/scripts/rhel7/dockerize.sh b/scripts/rhel7/dockerize.sh
@@ -10,13 +10,8 @@ systemctl --quiet is-active dbus.service && systemctl stop dbus.service
 systemctl --quiet is-active mariadb.service && systemctl stop mariadb.service
 systemctl --quiet is-active postfix.service && systemctl stop postfix.service
 
-awk '(NF==0&&!done){print "override_install_langs='$LANG'\ntsflags=nodocs";done=1}{print}' \
-    < /etc/yum.conf > /etc/yum.conf.new
-mv /etc/yum.conf.new /etc/yum.conf
 echo 'container' > /etc/yum/vars/infra
 
-rm -f /usr/lib/locale/locale-archive
-
 # Setup the login message instructions.
 if [[ ! "$PACKER_BUILD_NAME" =~ ^generic-.*$ ]]; then
   printf "Magma Daemon Development Environment\nTo download and compile magma, just execute the magma-build.sh script.\n\n" > /etc/motd

diff --git a/scripts/rhel8/dockerize.sh b/scripts/rhel8/dockerize.sh
@@ -15,13 +15,8 @@ systemctl --quiet is-active dbus.service && systemctl stop dbus.service
 systemctl --quiet is-active mariadb.service && systemctl stop mariadb.service
 systemctl --quiet is-active postfix.service && systemctl stop postfix.service
 
-awk '(NF==0&&!done){print "override_install_langs='$LANG'\ntsflags=nodocs";done=1}{print}' \
-    < /etc/dnf/dnf.conf > /etc/dnf/dnf.conf.new
-mv /etc/dnf/dnf.conf.new /etc/dnf/dnf.conf
 echo 'container' > /etc/dnf/vars/infra
 
-rm -f /usr/lib/locale/locale-archive
-
 # Setup the login message instructions.
 if [[ ! "$PACKER_BUILD_NAME" =~ ^generic-.*$ ]]; then
   printf "Magma Daemon Development Environment\nTo download and compile magma, just execute the magma-build.sh script.\n\n" > /etc/motd

diff --git a/scripts/rhel9/dockerize.sh b/scripts/rhel9/dockerize.sh
@@ -10,13 +10,8 @@ systemctl --quiet is-active mariadb.service && systemctl stop mariadb.service
 systemctl --quiet is-active postfix.service && systemctl stop postfix.service
 systemctl --quiet is-active dbus-broker.service && systemctl stop dbus-broker.service
 
-awk '(NF==0&&!done){print "override_install_langs='$LANG'\ntsflags=nodocs";done=1}{print}' \
-    < /etc/dnf/dnf.conf > /etc/dnf/dnf.conf.new
-mv /etc/dnf/dnf.conf.new /etc/dnf/dnf.conf
 echo 'container' > /etc/dnf/vars/infra
 
-rm -f /usr/lib/locale/locale-archive
-
 # Setup the login message instructions.
 if [[ ! "$PACKER_BUILD_NAME" =~ ^generic-.*$ ]]; then
   printf "Magma Daemon Development Environment\nTo download and compile magma, just execute the magma-build.sh script.\n\n" > /etc/motd

diff --git a/scripts/rocky8/dockerize.sh b/scripts/rocky8/dockerize.sh
@@ -15,13 +15,8 @@ systemctl --quiet is-active dbus.service && systemctl stop dbus.service
 systemctl --quiet is-active mariadb.service && systemctl stop mariadb.service
 systemctl --quiet is-active postfix.service && systemctl stop postfix.service
 
-awk '(NF==0&&!done){print "override_install_langs='$LANG'\ntsflags=nodocs";done=1}{print}' \
-    < /etc/dnf/dnf.conf > /etc/dnf/dnf.conf.new
-mv /etc/dnf/dnf.conf.new /etc/dnf/dnf.conf
 echo 'container' > /etc/dnf/vars/infra
 
-rm -f /usr/lib/locale/locale-archive
-
 # Setup the login message instructions.
 if [[ ! "$PACKER_BUILD_NAME" =~ ^generic-.*$ ]]; then
   printf "Magma Daemon Development Environment\nTo download and compile magma, just execute the magma-build.sh script.\n\n" > /etc/motd

diff --git a/scripts/rocky9/dockerize.sh b/scripts/rocky9/dockerize.sh
@@ -10,13 +10,8 @@ systemctl --quiet is-active mariadb.service && systemctl stop mariadb.service
 systemctl --quiet is-active postfix.service && systemctl stop postfix.service
 systemctl --quiet is-active dbus-broker.service && systemctl stop dbus-broker.service
 
-awk '(NF==0&&!done){print "override_install_langs='$LANG'\ntsflags=nodocs";done=1}{print}' \
-    < /etc/dnf/dnf.conf > /etc/dnf/dnf.conf.new
-mv /etc/dnf/dnf.conf.new /etc/dnf/dnf.conf
 echo 'container' > /etc/dnf/vars/infra
 
-rm -f /usr/lib/locale/locale-archive
-
 # Setup the login message instructions.
 if [[ ! "$PACKER_BUILD_NAME" =~ ^generic-.*$ ]]; then
   printf "Magma Daemon Development Environment\nTo download and compile magma, just execute the magma-build.sh script.\n\n" > /etc/motd