git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ocaml: Remove the old OCaml viewer program.
[libguestfs.git]
/
appliance
/
make.sh.in
diff --git
a/appliance/make.sh.in
b/appliance/make.sh.in
index
0dbce56
..
36bcd6c
100755
(executable)
--- 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.
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
rm -f $output
rm -f $koutput
@@
-105,6
+105,7
@@
if [ "@DIST@" = "REDHAT" ]; then
/usr/sbin/groupmems \
/sbin/unix_update \
/usr/sbin/tcpd \
/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- \
/lib/dbus-1/dbus-daemon-launch-helper \
/lib64/dbus-1/dbus-daemon-launch-helper \
/etc/passwd- \
@@
-162,16
+163,12
@@
__EOF__
@FEBOOTSTRAP_RUN@ initramfs -- touch /etc/fstab
fi
@FEBOOTSTRAP_RUN@ initramfs -- touch /etc/fstab
fi
- echo nameserver 1
0.0
.2.3 > resolv.conf.new
+ echo nameserver 1
69.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
@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
elif [ "@DIST@" = "DEBIAN" ]; then
cd @top_builddir@/appliance
debirf make -n debian