X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=appliance%2Fmake.sh.in;h=efd1f463cf972575f7182b970e09d16a2a332f98;hp=9aa1e68c907b2c56e7c1eae60eb4cf0e9d81a7ef;hb=e319b120acec1962319cca534d4504a8999135db;hpb=aca024e9766268e6a09a8aeedee562d10910ca6d

diff --git a/appliance/make.sh.in b/appliance/make.sh.in
index 9aa1e68..efd1f46 100755
--- a/appliance/make.sh.in
+++ b/appliance/make.sh.in
@@ -41,6 +41,11 @@ if [ "@DIST@" = "REDHAT" ]; then
 
   @FEBOOTSTRAP@ $packages -u @UPDATES@ @REPO@ initramfs @MIRROR@
 
+  # Create modules.dep.  This is only used in the normal appliance
+  # (not supermin).
+  kversion=$(basename initramfs/lib/modules/*)
+  @FEBOOTSTRAP_RUN@ initramfs -- /sbin/depmod -a $kversion
+
   # /sysroot is where the guest root filesystem will be mounted.
   @FEBOOTSTRAP_RUN@ initramfs -- mkdir -p --mode=0777 /sysroot
 
@@ -81,13 +86,15 @@ if [ "@DIST@" = "REDHAT" ]; then
 
   # Remove some unreadable binaries which are incompatible with
   # the supermin appliance.  Since these binaries can't be read
-  # from the host filesystem, they generate warnings like:
-  #   cpio: ./usr/bin/chfn: Cannot open: Permission denied
-  # These binaries are not needed for operation of the appliance.
+  # from the host filesystem, they cannot be added to the supermin
+  # appliance at run time.  XXX Need a better fix for this.
+  # Probably we should change febootstrap-supermin-helper to just
+  # ignore such files.
   @FEBOOTSTRAP_RUN@ initramfs -- rm -f \
     /usr/bin/chfn \
     /usr/bin/chsh \
     /usr/libexec/pt_chown \
+    /usr/libexec/utempter/utempter \
     /usr/sbin/groupdel \
     /usr/sbin/groupadd \
     /usr/sbin/useradd \
@@ -98,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- \
@@ -155,16 +163,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