X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.common;h=c88d8279b5e71e3e5dcd99a67caba09f2a6c6542;hb=c8f6b35b7bfcfc3d8d4004a84194f12eccc603d2;hp=9f3adfb796622bf0deb7cc452bc82f80ebe61011;hpb=31a02b8f3144038782ed3fbbb03f0c042612f6ed;p=build.git

diff --git a/build.common b/build.common
index 9f3adfb7..c88d8279 100644
--- a/build.common
+++ b/build.common
@@ -65,7 +65,7 @@ function pl_getReleaseName () {
         [Ss]L*)
             releasename=sl$release
             ;;
-        wheezy|jessie|precise|trusty|utopic|vivid|wily|xenial)
+        wheezy|jessie|trusty|xenial|bionic)
             releasename=$distro
             ;;
         *)
@@ -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