If using SELinux, mount /selinux in the appliance.

[libguestfs.git] / appliance / make.sh.in

diff --git a/appliance/make.sh.in b/appliance/make.sh.in
index e98c325..66bdebc 100755 (executable)
--- a/appliance/make.sh.in
+++ b/appliance/make.sh.in
@@ -21,6 +21,7 @@
 unset CDPATH
 
 set -e
+set -x
 
 if [ "@DIST@" = "REDHAT" ]; then
   cd @top_builddir@
@@ -46,6 +47,9 @@ if [ "@DIST@" = "REDHAT" ]; then
   # Create /tmp if it is missing.
   @FEBOOTSTRAP_RUN@ initramfs -- mkdir -p --mode=0777 /tmp
 
+  # Create /selinux if it is missing.
+  @FEBOOTSTRAP_RUN@ initramfs -- mkdir -p --mode=0755 /selinux
+
   # Nuke some stuff.  The kernel pulls mkinitrd and plymouth which pulls in
   # all of Python.  Sheez.
   (cd initramfs && find -name '*plymouth*' -print0) |
@@ -65,8 +69,8 @@ if [ "@DIST@" = "REDHAT" ]; then
   # Don't need any keyboard maps.
   @FEBOOTSTRAP_RUN@ initramfs -- rm -rf /lib/kbd
 
-  # Remove anything in home directory.  Because this is potentially
-  # liable to monstrous fuck-ups, we don't put a slash before 'home'.
+  # Remove anything in home directory.  Because of the potential for disaster
+  # we don't put a slash before 'home'.
   (cd initramfs && echo home/*) |
     xargs @FEBOOTSTRAP_RUN@ initramfs -- rm -rf
 
@@ -132,13 +136,6 @@ __EOF__
   @FEBOOTSTRAP_INSTALL@ initramfs resolv.conf.new /etc/resolv.conf 0644 root.root
   rm resolv.conf.new
 
-  # Create the init script.
-  @FEBOOTSTRAP_INSTALL@ initramfs appliance/init /init 0755 root.root
-
-  # Just in case the kernel isn't looking for /init, make /sbin/init
-  # be our script, not the real init.
-  #@FEBOOTSTRAP_RUN@ initramfs -- ln -f /init /sbin/init
-
   ls -lh $koutput
 
   # Now directly run the update script to copy/update the daemon in the
@@ -148,5 +145,6 @@ __EOF__
 elif [ "@DIST@" = "DEBIAN" ]; then
   cd @top_builddir@/appliance
   debirf make -n debian
+  mkdir -p @top_builddir@/initramfs
+  touch @top_builddir@/initramfs/fakeroot.log
 fi
-