projects
/
grml-live.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f76869e
)
Update docs regarding /etc/grml/fai/apt/sources.list; replace unstable SUITE with sid
author
Michael Prokop
<mika@grml.org>
Mon, 23 Feb 2009 01:05:00 +0000
(
02:05
+0100)
committer
Michael Prokop
<mika@grml.org>
Mon, 23 Feb 2009 01:05:00 +0000
(
02:05
+0100)
debian/changelog
patch
|
blob
|
history
etc/grml/fai/apt/sources.list
patch
|
blob
|
history
etc/grml/fai/config/hooks/instsoft.GRMLBASE
patch
|
blob
|
history
etc/grml/grml-live.conf
patch
|
blob
|
history
grml-live
patch
|
blob
|
history
diff --git
a/debian/changelog
b/debian/changelog
index
3d2c643
..
ac9a054
100644
(file)
--- a/
debian/changelog
+++ b/
debian/changelog
@@
-47,8
+47,12
@@
grml-live (0.9.9) unstable; urgency=low
* Integrate bsd4grml [hash: 987ce9a6f9ce205ba64794ed3fcac603]. This
provides MirBSD as bootoption 'bsd' at grml's bootprompt. Thanks to
Thorsten "mirabilos" Glaser for his work!
* Integrate bsd4grml [hash: 987ce9a6f9ce205ba64794ed3fcac603]. This
provides MirBSD as bootoption 'bsd' at grml's bootprompt. Thanks to
Thorsten "mirabilos" Glaser for his work!
+ * Add informational header to /etc/grml/fai/apt/sources.list and
+ update docs regarding the file.
+ * If specified SUITE is unstable use 'sid' instead (to avoid breakages
+ with debootstrap).
- -- Michael Prokop <mika@grml.org> Mon, 23 Feb 2009 0
0:51:37
+0100
+ -- Michael Prokop <mika@grml.org> Mon, 23 Feb 2009 0
2:04:05
+0100
grml-live (0.9.8) unstable; urgency=low
grml-live (0.9.8) unstable; urgency=low
diff --git
a/etc/grml/fai/apt/sources.list
b/etc/grml/fai/apt/sources.list
index
ff9fae6
..
79683e8
100644
(file)
--- a/
etc/grml/fai/apt/sources.list
+++ b/
etc/grml/fai/apt/sources.list
@@
-1,3
+1,7
@@
+# NOTE: This file is *NOT* meant for manual customisation! This file is
+# modified by grml-live and any changes might be overriden.
+# You might consider using GRML_LIVE_SOURCES in /etc/grml/grml-live.conf*
+# and using /etc/grml/fai/files/etc/apt instead!'
deb http://deb.grml.org/ grml-stable main
deb http://deb.grml.org/ grml-testing main
deb http://ftp.de.debian.org/debian lenny main contrib non-free
deb http://deb.grml.org/ grml-stable main
deb http://deb.grml.org/ grml-testing main
deb http://ftp.de.debian.org/debian lenny main contrib non-free
diff --git
a/etc/grml/fai/config/hooks/instsoft.GRMLBASE
b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
index
d0a09f7
..
bbabb90
100755
(executable)
--- a/
etc/grml/fai/config/hooks/instsoft.GRMLBASE
+++ b/
etc/grml/fai/config/hooks/instsoft.GRMLBASE
@@
-82,6
+82,8
@@
else # no softupdate but fresh installation
# install all apt related files
if [ -r /etc/grml/fai/files/etc/apt ] ; then
cp -a /etc/grml/fai/files/etc/apt/* $target/etc/apt/
# install all apt related files
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
fi
# install all present (but at least the grml) gpg keys:
fi
# install all present (but at least the grml) gpg keys:
@@
-99,6
+101,9
@@
else
$ROOTCMD apt-key add /etc/apt/grml.key
fi
$ROOTCMD apt-key add /etc/apt/grml.key
fi
+# make sure the file exists
+[ -e $target/etc/apt/apt.conf ] || touch $target/etc/apt/apt.conf
+
# work around http://trac.lighttpd.net/trac/ticket/657
if ! grep -q 'Acquire::http::Pipeline-Depth.*0' $target/etc/apt/apt.conf ; then
echo "Acquire::http::Pipeline-Depth 0; // added by grml-live" >> $target/etc/apt/apt.conf
# work around http://trac.lighttpd.net/trac/ticket/657
if ! grep -q 'Acquire::http::Pipeline-Depth.*0' $target/etc/apt/apt.conf ; then
echo "Acquire::http::Pipeline-Depth 0; // added by grml-live" >> $target/etc/apt/apt.conf
diff --git
a/etc/grml/grml-live.conf
b/etc/grml/grml-live.conf
index
a6b18b4
..
9ffb051
100644
(file)
--- a/
etc/grml/grml-live.conf
+++ b/
etc/grml/grml-live.conf
@@
-46,11
+46,12
@@
CLASSES="GRMLBASE,GRML_MEDIUM,I386"
## *FAI_DEBOOTSTRAP* accordingly. To use a local directory (like an NFS mount)
## check out MIRROR_DIRECTORY and MIRROR_SOURCES as well.
## *FAI_DEBOOTSTRAP* accordingly. To use a local directory (like an NFS mount)
## check out MIRROR_DIRECTORY and MIRROR_SOURCES as well.
-#
Do you want to generate /etc/grml/fai/apt/sources.list on-the-fly via grml-live?
-#
If so then activate the according mirrors using GRML_LIVE_SOURCES=...
+#
Which Debian mirror do you want to use for main packages (after debootstrapping
+#
has been finished)?
# If you do *not* set GRML_LIVE_SOURCES here then grml-live will just take what
# If you do *not* set GRML_LIVE_SOURCES here then grml-live will just take what
-# /etc/grml/fai/apt/sources.list provides by default.
-# Use the variable like your /etc/apt/sources.list looks like.
+# /etc/grml/fai/apt/sources.list provides by default. But please do *not*
+# manually edit /etc/grml/fai/apt/sources.list but instead use $GRML_LIVE_SOURCES.
+# Use the variable as your /etc/apt/sources.list looks like.
#GRML_LIVE_SOURCES="
#deb http://192.168.1.112/debian lenny main contrib non-free
#deb http://deb.grml.org/ grml-stable main
#GRML_LIVE_SOURCES="
#deb http://192.168.1.112/debian lenny main contrib non-free
#deb http://deb.grml.org/ grml-stable main
diff --git
a/grml-live
b/grml-live
index
477bded
..
6beb3ba
100755
(executable)
--- a/
grml-live
+++ b/
grml-live
@@
-353,6
+353,11
@@
fi
# does this suck? YES!
if [ -n "$SUITE" ] ; then
# does this suck? YES!
if [ -n "$SUITE" ] ; then
+ # /usr/share/debootstrap/scripts/unstable does not exist, instead use 'sid':
+ case $SUITE in
+ unstable) SUITE='sid' ;;
+ esac
+
DIST=" etch\| stable\| lenny\| squeeze\| testing\| sid\| unstable"
sed "s/\(deb .\+\)\([ \t]*\) $DIST\([ \t]*\)\(main \)/\1\2 $SUITE \3\4/" /etc/grml/fai/apt/sources.list | sponge /etc/grml/fai/apt/sources.list
for file in "$LIVE_CONF" "$CONFIG" "$LOCAL_CONFIG" ; do
DIST=" etch\| stable\| lenny\| squeeze\| testing\| sid\| unstable"
sed "s/\(deb .\+\)\([ \t]*\) $DIST\([ \t]*\)\(main \)/\1\2 $SUITE \3\4/" /etc/grml/fai/apt/sources.list | sponge /etc/grml/fai/apt/sources.list
for file in "$LIVE_CONF" "$CONFIG" "$LOCAL_CONFIG" ; do