summaryrefslogtreecommitdiff
path: root/lists
diff options
context:
space:
mode:
authorChris Lamb <chris@chris-lamb.co.uk>2008-09-09 20:24:36 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:03:41 +0100
commitea2d585a664909596b5fa9222af0236cd12b1225 (patch)
tree28dcd4790c8c70fa2ee861b45bcda5ecd87bcac8 /lists
parent8ae8268a1a0d1bb7917f4a4984d35addc74f9523 (diff)
downloadvyos-live-build-ea2d585a664909596b5fa9222af0236cd12b1225.tar.gz
vyos-live-build-ea2d585a664909596b5fa9222af0236cd12b1225.zip
Removing packages from rescue list where they 'Conflict:' with each other.
Diffstat (limited to 'lists')
-rw-r--r--lists/rescue3
1 files changed, 1 insertions, 2 deletions
diff --git a/lists/rescue b/lists/rescue
index 7bc149fba..b4e1bead6 100644
--- a/lists/rescue
+++ b/lists/rescue
@@ -37,7 +37,7 @@ syslinux-common
#endif
#if ARCHITECTURE i386
pstack
-grub-pc syslinux mbr
+syslinux mbr
#endif
# Editors
@@ -116,7 +116,6 @@ strongswan
sipcalc
socat
ssh
-telnet
telnet-ssl
whois
irssi