X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=appliance%2Fmake.sh.in;h=64bcb5a46e3d7df274fd5172edb044bed0f7d636;hb=c1592ac93886e7f39a6017272b2486d3f411d054;hp=ccaa75700630c8f1fd0b85b8234af72e1d2ba736;hpb=d1c2287fe4636db9a54888e71fb150984f00b0e4;p=libguestfs.git

diff --git a/appliance/make.sh.in b/appliance/make.sh.in
index ccaa757..64bcb5a 100755
--- a/appliance/make.sh.in
+++ b/appliance/make.sh.in
@@ -26,8 +26,8 @@ set -x
 if [ "@DIST@" = "REDHAT" ]; then
   cd @top_builddir@
   # Decide on names for the final output.  These have to match Makefile.am.
-  output=appliance/initramfs.@REPO@.@host_cpu@.img
-  koutput=appliance/vmlinuz.@REPO@.@host_cpu@
+  output=appliance/initramfs.@host_cpu@.img
+  koutput=appliance/vmlinuz.@host_cpu@
   rm -f $output
   rm -f $koutput
 
@@ -105,6 +105,7 @@ if [ "@DIST@" = "REDHAT" ]; then
     /usr/sbin/groupmems \
     /sbin/unix_update \
     /usr/sbin/tcpd \
+    /usr/share/dbus-1/services/org.selinux.Restorecond.service \
     /lib/dbus-1/dbus-daemon-launch-helper \
     /lib64/dbus-1/dbus-daemon-launch-helper \
     /etc/passwd- \
@@ -127,6 +128,11 @@ if [ "@DIST@" = "REDHAT" ]; then
     /var/log/yum.log \
     $(cd initramfs && echo usr/sbin/glibc_post_upgrade.*)
 
+  # Remove all .*.hmac files (RHBZ#654638).  These are not used unless
+  # you are using FIPS, and they cause hard dependencies on files
+  # which change whenever a library version is bumped.
+  @FEBOOTSTRAP_RUN@ initramfs -- rm -f $(cd initramfs && find -name '.*.hmac')
+
   # Kernel modules take up nearly half of the image.  Only include ones
   # which are on the whitelist.
   exec 5<appliance/kmod.whitelist