7:20 a.m.
Since v1:
- Don't remove the whole of /var/log
- Cleanups and fixes to appliance/Makefile.am
7:20 a.m.
New subject: [PATCH v2 1/3] appliance: Rebuild appliance if excludefiles changes.
---
appliance/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/appliance/Makefile.am b/appliance/Makefile.am
index 3135219..addd4b1 100644
--- a/appliance/Makefile.am
+++ b/appliance/Makefile.am
@@ -44,7 +44,7 @@ superminfs_DATA = \
supermin.d/udev-rules.tar.gz
supermin.d/base.tar.gz supermin.d/packages: stamp-supermin
-stamp-supermin: make.sh packagelist
+stamp-supermin: make.sh packagelist supermin.d/excludefiles
rm -f $@ supermin.d/base.tar.gz supermin.d/packages
./make.sh
$(MAKE) \
--
2.3.1
7:20 a.m.
New subject: [PATCH v2 2/3] appliance: Remove typo $@ at beginning of line.
This fixes commit 82b486a9086f84447324d68b3c0cae300e0334f7.
---
appliance/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/appliance/Makefile.am b/appliance/Makefile.am
index addd4b1..d21e743 100644
--- a/appliance/Makefile.am
+++ b/appliance/Makefile.am
@@ -91,7 +91,7 @@ supermin.d/daemon.tar.gz: ../daemon/guestfsd guestfsd.suppressions
guestfs_lvm_c
# Note we must avoid touching supermin.d if possible, so don't create
# the temporary files inside the supermin.d directory.
-$(a)supermin.d/excludefiles: excludefiles.in Makefile
+supermin.d/excludefiles: excludefiles.in Makefile
m4 $(PACKAGELIST_CPP_FLAGS) $< | \
grep -v '^[[:space:]]*$$' | grep -v '^#' > excludefiles-t
cmp -s $@ excludefiles-t || mv excludefiles-t $@
--
2.3.1
7:20 a.m.
New subject: [PATCH v2 3/3] appliance: Exclude more log files (RHBZ#1239154).
This removes further possible log files from the appliance, but
without removing any subdirectories.
---
appliance/excludefiles.in | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/appliance/excludefiles.in b/appliance/excludefiles.in
index 9a48db7..5afeede 100644
--- a/appliance/excludefiles.in
+++ b/appliance/excludefiles.in
@@ -32,12 +32,23 @@ dnl The right kernel modules are added back by supermin.
-/usr/share/i18n/*
-/usr/share/pkgconfig/*
+-/var/log/?tmp
-/var/log/*.log*
+-/var/log/*.gz
-/var/log/cron*
-/var/log/lastlog*
+-/var/log/maillog*
-/var/log/messages*
-/var/log/secure*
-/var/log/syslog*
+-/var/log/tallylog*
+
+-/var/log/*/*.log*
+-/var/log/*/*.gz
+-/var/log/*/secure*
+-/var/log/*/syslog*
+
+-/var/log/sa/*
dnl For Debian:
-/usr/share/lintian/*
--
2.3.1
3424
days inactive
3424
days old
3 comments
1 participants
participants (1)
-
Richard W.M. Jones