manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removing broken samhain handling (Closes: #785264).

This commit is contained in:
Daniel Baumann 2015-05-14 13:15:45 +02:00
parent 9280926b11
commit 095e999d0c
1 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
scripts/build/chroot_dpkg
View File

@ -62,15 +62,6 @@ EOF
# Generic live-build handle for other live packages to act upon # Generic live-build handle for other live packages to act upon
touch chroot/.live-build touch chroot/.live-build
# samhain
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
# flash-kernel # flash-kernel
Chroot chroot dpkg-divert --rename --quiet --add /usr/sbin/flash-kernel Chroot chroot dpkg-divert --rename --quiet --add /usr/sbin/flash-kernel
ln -s /bin/true chroot/usr/sbin/flash-kernel ln -s /bin/true chroot/usr/sbin/flash-kernel
@ -97,16 +88,6 @@ EOF
rm -f chroot/usr/sbin/flash-kernel rm -f chroot/usr/sbin/flash-kernel
Chroot chroot dpkg-divert --rename --quiet --remove /usr/sbin/flash-kernel Chroot chroot dpkg-divert --rename --quiet --remove /usr/sbin/flash-kernel
# samhain
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
# Remove custom start-stop-daemon program # Remove custom start-stop-daemon program
rm -f chroot/sbin/start-stop-daemon rm -f chroot/sbin/start-stop-daemon
Chroot chroot dpkg-divert --rename --quiet --remove /sbin/start-stop-daemon Chroot chroot dpkg-divert --rename --quiet --remove /sbin/start-stop-daemon