Bug#698423: fixing samhain : a possible typo in live-build version 3.0~b5-1
Package: live-build
Version: 3.0~b5-1
Tags: patch
Dear maintainers,
I wonder if the following patch could correct a typo in the unstable
version of live-build.
As far as I understand, if samhain is not installed on the build host,
the current code amounts to create as root a directory /var/state/samhain
- or to a failure if live-build is invoked as a normal user with fakeroot.
Or did I miss something ?
Thanks in advance !
Regards,
JH Chatenet
diff -Naur a/usr/lib/live/build/chroot_dpkg b/usr/lib/live/build/chroot_dpkg
--- a/usr/lib/live/build/chroot_dpkg 2012-12-31 23:12:21.000000000 +0000
+++ b/usr/lib/live/build/chroot_dpkg 2013-01-18 12:31:44.966528061 +0000
@@ -62,12 +62,16 @@
# Manual hacks for special packages
# samhain
- if [ -e /var/state/samhain/samhain_file ]
+ # do nothing if samhain is not installed on the build host
+ if [ -e /usr/sbin/samhain ]
then
- mv /var/state/samhain/samhain_file /var/state/samhain/samhain_file.orig
- else
- mkdir -p /var/state/samhain
- touch /var/state/samhain/samhain_file
+ if [ -e /var/state/samhain/samhain_file ]
+ then
+ mv /var/state/samhain/samhain_file /var/state/samhain/samhain_file.orig
+ else
+ mkdir -p /var/state/samhain
+ touch /var/state/samhain/samhain_file
+ fi
fi
# flash-kernel
@@ -94,13 +98,17 @@
Chroot chroot dpkg-divert --rename --quiet --remove /usr/sbin/flash-kernel
# samhain
- if [ -e /var/state/samhain/samhain_file.orig ]
+ # do nothing if samhain is not installed on the build host
+ if [ -e /usr/sbin/samhain ]
then
- mv /var/state/samhain/samhain_file.orig /var/state/samhain/samhain_file
- elif [ -d /var/state/samhain ]
- then
- rm -f /var/state/samhain/samhain_file
- rmdir --ignore-fail-on-non-empty /var/state/samhain || true
+ if [ -e /var/state/samhain/samhain_file.orig ]
+ then
+ mv /var/state/samhain/samhain_file.orig /var/state/samhain/samhain_file
+ elif [ -d /var/state/samhain ]
+ then
+ rm -f /var/state/samhain/samhain_file
+ rmdir --ignore-fail-on-non-empty /var/state/samhain || true
+ fi
fi
# Restore start-stop-daemon program
Reply to: