projects
/
grml-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Drop deprecated firmware-ipw3945 + ipw3945d
[grml-live.git]
/
etc
/
grml
/
fai
/
config
/
scripts
/
GRMLBASE
/
33-aptsetup
diff --git
a/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
b/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
index
03c153b
..
9e4df63
100755
(executable)
--- a/
etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
+++ b/
etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
@@
-11,6
+11,11
@@
set -e
# remove leftover from /etc/grml/fai/config/hooks/instsoft.GRMLBASE:
rm -f $target/etc/apt/sources.list.d/grml-live.list
# 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"
GRML_SOURCES_LIST="$target/etc/apt/sources.list.d/grml.list"
DEBIAN_SOURCES_LIST="$target/etc/apt/sources.list.d/debian.list"
@@
-43,8
+48,8
@@
fi
# configure official Debian repositories:
cat > "$DEBIAN_SOURCES_LIST" << EOF
# official debian repository:
# configure official Debian repositories:
cat > "$DEBIAN_SOURCES_LIST" << EOF
# official debian repository:
- deb http://
ftp.de.debian.org
/debian/ $SUITE main contrib non-free
- deb-src http://
ftp.de.debian.org
/debian/ $SUITE main contrib non-free
+ deb http://
cdn.debian.net
/debian/ $SUITE main contrib non-free
+ deb-src http://
cdn.debian.net
/debian/ $SUITE main contrib non-free
EOF
# configure grml-stable repository:
EOF
# configure grml-stable repository: