From 623046ab67da57fb8635ac53a2890131090265eb Mon Sep 17 00:00:00 2001 From: TomasM Date: Tue, 21 Nov 2017 01:41:07 -0500 Subject: [PATCH] Make Debian apt settings more correctly --- Slax/debian/build | 1 + .../rootcopy/etc/apt/apt.conf.d/000Slax | 3 +++ Slax/debian/rootcopy/root/.bashrc | 22 ------------------- 3 files changed, 4 insertions(+), 22 deletions(-) create mode 100644 Slax/debian/rootcopy/etc/apt/apt.conf.d/000Slax diff --git a/Slax/debian/build b/Slax/debian/build index ea5c0b7..7a3f503 100755 --- a/Slax/debian/build +++ b/Slax/debian/build @@ -5,6 +5,7 @@ THIS=$(dirname $(readlink -f $0)) sed -i -r 's/^LIVEKITNAME.*/LIVEKITNAME="slax"/' $THIS/../../config sed -i -r 's/^NETWORK.*/NETWORK=true/' $THIS/../../config +. ./copy . ./install . ./cleanup . ./copy diff --git a/Slax/debian/rootcopy/etc/apt/apt.conf.d/000Slax b/Slax/debian/rootcopy/etc/apt/apt.conf.d/000Slax new file mode 100644 index 0000000..e197a86 --- /dev/null +++ b/Slax/debian/rootcopy/etc/apt/apt.conf.d/000Slax @@ -0,0 +1,3 @@ +APT::Install-Recommends "0"; +APT::Install-Suggests "0"; +Acquire::Languages { "none"; } diff --git a/Slax/debian/rootcopy/root/.bashrc b/Slax/debian/rootcopy/root/.bashrc index 34ab25a..ece2af3 100644 --- a/Slax/debian/rootcopy/root/.bashrc +++ b/Slax/debian/rootcopy/root/.bashrc @@ -13,28 +13,6 @@ ls() { /bin/ls $LS_OPTIONS "$@"; } ll() { /bin/ls $LS_OPTIONS -l "$@"; } l() { /bin/ls $LS_OPTIONS -lA "$@"; } -apt-get() -{ - if [ -e /var/cache/apt/pkgcache.bin ]; then - /usr/bin/apt-get --no-install-recommends "$@" - else - /usr/bin/apt-get update - /usr/bin/apt-get --no-install-recommends "$@" - fi -} - -apt() -{ - if [ -e /var/cache/apt/pkgcache.bin ]; then - /usr/bin/apt --no-install-recommends "$@" - else - /usr/bin/apt update - /usr/bin/apt --no-install-recommends "$@" - fi -} - export -f ls export -f ll export -f l -export -f apt-get -export -f apt