6:12 a.m.
On Fri, Jul 03, 2009 at 01:00:20PM +0200, Guido Günther wrote:
On Fri, Jul 03, 2009 at 10:52:00AM +0100, Richard W.M. Jones wrote:
>
> Guido, please see if this cset fixes your issue:
>
>
http://git.et.redhat.com/?p=libguestfs.git;a=commitdiff;h=a67c46b4b2ff5a2...
>
Thanks! Looks good. While looking at this, I noticed that we can easily
drop some of the debirf scripts. Possible patch attached.
The remaining symlinks don't contain much. I could put them into one
script so we don't have to ship any symlinks if you'd prefer that?
The second patch attached touches fakeroot.log (which is what's checked
by applicance/Makefile) so the appliance doesn't get rebuild every time.
I pushed both of these patches.
Rich.
>From 8eee4dea4c705d3156ac31356565a8f9b30c2f8d Mon Sep 17 00:00:00
2001
From: =?utf-8?q?Guido=20G=C3=BCnther?= <agx(a)sigxcpu.org>
Date: Fri, 3 Jul 2009 12:42:38 +0200
Subject: [PATCH] remove superflous debirf scripts
---
appliance/Makefile.am | 4 ----
appliance/debian/modules/a0_motd | 1 -
appliance/debian/modules/network | 1 -
appliance/debian/modules/root-bashrc | 1 -
appliance/debian/modules/serial-terminal | 1 -
5 files changed, 0 insertions(+), 8 deletions(-)
delete mode 120000 appliance/debian/modules/a0_motd
delete mode 120000 appliance/debian/modules/network
delete mode 120000 appliance/debian/modules/root-bashrc
delete mode 120000 appliance/debian/modules/serial-terminal
diff --git a/appliance/Makefile.am b/appliance/Makefile.am
index 9de11cd..ff75a67 100644
--- a/appliance/Makefile.am
+++ b/appliance/Makefile.am
@@ -98,11 +98,7 @@ endif
# Extra symlinks needed by the Debian appliance.
debirf_symlinks = \
- a0_motd \
a0_prep-root \
- network \
- root-bashrc \
- serial-terminal \
z0_remove-aptitude \
z0_remove-locales \
z1_clean-root
diff --git a/appliance/debian/modules/a0_motd b/appliance/debian/modules/a0_motd
deleted file mode 120000
index 8e3ad2f..0000000
--- a/appliance/debian/modules/a0_motd
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/debirf/modules/a0_motd
\ No newline at end of file
diff --git a/appliance/debian/modules/network b/appliance/debian/modules/network
deleted file mode 120000
index 979418d..0000000
--- a/appliance/debian/modules/network
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/debirf/modules/network
\ No newline at end of file
diff --git a/appliance/debian/modules/root-bashrc b/appliance/debian/modules/root-bashrc
deleted file mode 120000
index 651d030..0000000
--- a/appliance/debian/modules/root-bashrc
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/debirf/modules/root-bashrc
\ No newline at end of file
diff --git a/appliance/debian/modules/serial-terminal
b/appliance/debian/modules/serial-terminal
deleted file mode 120000
index a5376da..0000000
--- a/appliance/debian/modules/serial-terminal
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/debirf/modules/serial-terminal
\ No newline at end of file
--
1.6.3.3
From: =?utf-8?q?Guido=20G=C3=BCnther?= <agx(a)sigxcpu.org>
Date: Thu, 2 Jul 2009 17:30:40 +0200
Subject: [PATCH] touch fakeroot.log
indicationg we're done creating the appliance
---
appliance/make.sh.in | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/appliance/make.sh.in b/appliance/make.sh.in
index e98c325..dd36bb4 100755
--- a/appliance/make.sh.in
+++ b/appliance/make.sh.in
@@ -148,5 +148,7 @@ __EOF__
elif [ "@DIST@" = "DEBIAN" ]; then
cd @top_builddir@/appliance
debirf make -n debian
+ mkdir -p @top_builddir@/initramfs
+ touch @top_builddir(a)/initramfs/fakeroot.log
fi
--
--
Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones
virt-df lists disk usage of guests without needing to install any
software inside the virtual machine. Supports Linux and Windows.
http://et.redhat.com/~rjones/virt-df/