nodeimage and nodemanager move to master as a move to align fedora31 to gnupg1 instea...

[build.git] / build.common

diff --git a/build.common b/build.common
index 1320910..c88d827 100644 (file)
--- a/build.common
+++ b/build.common
@@ -433,21 +433,21 @@ fi
     # Clean yum cache
     echo "* Cleaning up"
 
-    # NOTE: this hack is for Fedora >= 12.
-    # if kernel-debug is installed, clean it up
-    # we link to our version of kernel/initrd and clean up
-    # kernel-debug manually
-    if rpm --root $vroot --quiet -q kernel-debug ; then
-        echo "* Cleaning up kernel-debug - (workaround for f12)"
-        pushd $vroot/boot/
-        rm -rf kernel-boot kernel-bootsmp initrd-boot initrd-bootsmp
-        ln -s vmlinuz-*${pldistro}* kernel-boot
-        ln -s vmlinuz-*${pldistro}* kernel-bootsmp
-        ln -s initrd-*${pldistro}* initrd-boot
-        ln -s initrd-*${pldistro}* initrd-bootsmp
-        rpm --root $vroot --nodeps -e kernel-debug || :
-        popd
-    fi
+#    # NOTE: this hack is for Fedora >= 12.
+#    # if kernel-debug is installed, clean it up
+#    # kernel-debug manually
+#    # we link to our version of kernel/initrd and clean up
+#    if rpm --root $vroot --quiet -q kernel-debug ; then
+#        echo "* Cleaning up kernel-debug - (workaround for f12)"
+#        pushd $vroot/boot/
+#        rm -rf kernel-boot kernel-bootsmp initrd-boot initrd-bootsmp
+#        ln -s vmlinuz-*${pldistro}* kernel-boot
+#        ln -s vmlinuz-*${pldistro}* kernel-bootsmp
+#        ln -s initrd-*${pldistro}* initrd-boot
+#        ln -s initrd-*${pldistro}* initrd-bootsmp
+#        rpm --root $vroot --nodeps -e kernel-debug || :
+#        popd
+#    fi
 
     # ignore yum's return code that is basically undefined
     yum $yum_options clean all || :
@@ -476,6 +476,15 @@ fi
 function pl_root_tune_image () {
     root=$1; shift
 
+    # This tells the Boot Manager that it is okay to update
+    # /etc/resolv.conf and /etc/hosts whenever the network configuration
+    # changes. Users are free to delete this file.
+    touch $root/etc/AUTO_UPDATE_NET_FILES
+
+    # all this sounds terribly old and out of scope
+    # turning off for fedora31 where it just fails
+    return 0
+
     # Disable all services in reference image
     chroot $root sh -c "/sbin/chkconfig --list | awk '{ print \$1 }' | xargs -i /sbin/chkconfig {} off"
 
@@ -484,10 +493,6 @@ function pl_root_tune_image () {
     rm -f $root/sbin/minilogd
     ln -nsf /bin/true $root/sbin/minilogd
 
-    # This tells the Boot Manager that it is okay to update
-    # /etc/resolv.conf and /etc/hosts whenever the network configuration
-    # changes. Users are free to delete this file.
-    touch $root/etc/AUTO_UPDATE_NET_FILES
 }
 
 # Move specified directories out of a src tree into a dst tree, and