diff options
| author | Daniel Baumann <mail@daniel-baumann.ch> | 2015-05-14 13:14:23 +0200 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2015-05-14 13:14:23 +0200 |
| commit | 1427cbfa222554524275a7946ec0d1da4080d1e9 (patch) | |
| tree | d70ffdcee2c1b19ecb6b42f68293165f1af423c7 | |
| parent | 34e068f802bd1f29da14d6f7c52e59ea0ce116e0 (diff) | |
| download | vyos-live-build-debian/4.0.5-1.tar.gz vyos-live-build-debian/4.0.5-1.zip | |
Removing broken samhain handling (Closes: #785264).debian/4.0.5-1
| -rwxr-xr-x | scripts/build/chroot_dpkg | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/scripts/build/chroot_dpkg b/scripts/build/chroot_dpkg index bd4a260f0..eb5026207 100755 --- a/scripts/build/chroot_dpkg +++ b/scripts/build/chroot_dpkg @@ -62,15 +62,6 @@ EOF # Generic live-build handle for other live packages to act upon 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 Chroot chroot dpkg-divert --rename --quiet --add /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 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 rm -f chroot/sbin/start-stop-daemon Chroot chroot dpkg-divert --rename --quiet --remove /sbin/start-stop-daemon |