Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
tails
live-build
Commits
095e999d
Commit
095e999d
authored
May 14, 2015
by
Daniel Baumann
Browse files
Removing broken samhain handling (Closes: #785264).
parent
9280926b
Changes
1
Hide whitespace changes
Inline
Side-by-side
scripts/build/chroot_dpkg
View file @
095e999d
...
...
@@ -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
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment