X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fhooks%2Finstsoft.GRMLBASE;h=df99f5b6587907dfba705fea04400e40fc730fb4;hb=68e0ee390976f9652122a08483b23a80bd924649;hp=213f39c9afdde29b694d7fe76375c63a886b6201;hpb=339590e244585c5334c41250b10abdc01e732a17;p=grml-live.git diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE index 213f39c..df99f5b 100755 --- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE +++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE @@ -58,6 +58,9 @@ EOF rm $target/etc/apt/sources.list fi cp /etc/grml/fai/apt/sources.list $target/etc/apt/sources.list.d/grml-live.list + if [ -r $target/etc/apt/sources.list.d/grml.list ] ; then + mv $target/etc/apt/sources.list.d/grml.list $target/etc/apt/sources.list.d/grml.unused + fi fi # run it on our own, as updatebase is used at the wrong stage for our needs, @@ -83,7 +86,9 @@ else # no softupdate but fresh installation if [ -r /etc/grml/fai/files/etc/apt ] ; then cp -a /etc/grml/fai/files/etc/apt/* $target/etc/apt/ # remove grml-live's sources.list file from chroot: - grep -q GRML_LIVE_SOURCES $target/etc/apt/important_note.txt && rm $target/etc/apt/important_note.txt + if [ -r $target/etc/apt/important_note.txt ] ; then + grep -q GRML_LIVE_SOURCES $target/etc/apt/important_note.txt && rm $target/etc/apt/important_note.txt + fi fi # install all present (but at least the grml) gpg keys: