X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=appliance%2Fmake.sh.in;h=64bcb5a46e3d7df274fd5172edb044bed0f7d636;hb=403ac796a5067ac558ceca2409270eb55b477299;hp=56b882a23221b1f688defb3ee3fd7902cf0f99ac;hpb=155aa76e57c99594a3724933b6d117f1053544b3;p=libguestfs.git

diff --git a/appliance/make.sh.in b/appliance/make.sh.in
index 56b882a..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
 
@@ -94,6 +94,7 @@ if [ "@DIST@" = "REDHAT" ]; then
     /usr/bin/chfn \
     /usr/bin/chsh \
     /usr/libexec/pt_chown \
+    /usr/libexec/utempter/utempter \
     /usr/sbin/groupdel \
     /usr/sbin/groupadd \
     /usr/sbin/useradd \
@@ -104,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- \
@@ -126,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
@@ -161,16 +168,12 @@ __EOF__
       @FEBOOTSTRAP_RUN@ initramfs -- touch /etc/fstab
   fi
 
-  echo nameserver 10.0.2.3 > resolv.conf.new
+  echo nameserver 169.254.2.3 > resolv.conf.new
   @FEBOOTSTRAP_INSTALL@ initramfs resolv.conf.new /etc/resolv.conf 0644 root.root
   rm resolv.conf.new
 
   ls -lh $koutput
 
-  # Now directly run the update script to copy/update the daemon in the
-  # initramfs.
-  cd appliance && bash update.sh
-
 elif [ "@DIST@" = "DEBIAN" ]; then
   cd @top_builddir@/appliance
   debirf make -n debian