projects
/
grml-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SW: Update to grml kernel 2.6.33.
[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
0750201
..
64bd111
100755
(executable)
--- a/
etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
+++ b/
etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
@@
-18,10
+18,14
@@
fi
# 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:
+# restore original grml sources.list file (temporarly moved via
+# /etc/grml/fai/config/hooks/instsoft.GRMLBASE):
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
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
+if [ -r $target/etc/apt/sources.list.d/debian.unused ] ; then
+ mv $target/etc/apt/sources.list.d/debian.unused $target/etc/apt/sources.list.d/debian.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"