X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F33-aptsetup;h=d78584f0669736dfe05341acab483531f712d907;hb=0f85d1ba6a21ba9426fcf3c867227e48573e4cdf;hp=a35de272f79323acd030fd7a17c59c624a1ba146;hpb=0692f4ab3b17a14234e76b5463ee74a5e89ba826;p=grml-live.git diff --git a/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup b/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup index a35de27..d78584f 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup +++ b/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup @@ -8,9 +8,21 @@ set -e +if [ -L "$target"/etc/apt/sources.list ] ; then + echo "Note: $target/etc/apt/sources.list seems to be the old sources.list setup." + echo "|-> Not modifying anything. If you want to switch to the new setup just" + echo "\`-> remove symlink $target/etc/apt/sources.list" + exit 0 +fi + # remove leftover from /etc/grml/fai/config/hooks/instsoft.GRMLBASE: rm -f $target/etc/apt/sources.list.d/grml-live.list +# restore original grml sources.list file: +if [ -r $target/etc/apt/sources.list.d/grml.unused ] ; then + mv $target/etc/apt/sources.list.d/grml.unused $target/etc/apt/sources.list.d/grml.list +fi + GRML_SOURCES_LIST="$target/etc/apt/sources.list.d/grml.list" DEBIAN_SOURCES_LIST="$target/etc/apt/sources.list.d/debian.list"