diff options
| author | Daniel Baumann <mail@daniel-baumann.ch> | 2015-05-14 13:15:45 +0200 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2015-05-14 13:15:45 +0200 |
| commit | 095e999d0c2c08df3a1dd5caa066edc218a82380 (patch) | |
| tree | 0f19510c7e1c71d81d107e20149e6eb777f56a1e | |
| parent | 9280926b11c8c95bf122a5f190af3787485d3698 (diff) | |
| download | vyos-live-build-095e999d0c2c08df3a1dd5caa066edc218a82380.tar.gz vyos-live-build-095e999d0c2c08df3a1dd5caa066edc218a82380.zip | |
Removing broken samhain handling (Closes: #785264).
| -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 4ec30ad87..7007e0569 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 |