projects
/
grml-debootstrap.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
95037fa
)
chroot-script: de-duplicate code WRT security mirror.
author
Michael Prokop
<mika@grml.org>
Wed, 10 Aug 2011 13:01:13 +0000
(15:01 +0200)
committer
Michael Prokop
<mika@grml.org>
Wed, 10 Aug 2011 13:01:13 +0000
(15:01 +0200)
chroot-script
patch
|
blob
|
history
diff --git
a/chroot-script
b/chroot-script
index
7206de9
..
3bbd19a
100755
(executable)
--- a/
chroot-script
+++ b/
chroot-script
@@
-59,25
+59,19
@@
chrootmirror() {
if [ -n "$ISO" ] ; then
echo "deb $ISO $RELEASE $COMPONENTS" > /etc/apt/sources.list
[ -n "$MIRROR" ] && echo "deb $MIRROR $RELEASE $COMPONENTS" >> /etc/apt/sources.list || true
if [ -n "$ISO" ] ; then
echo "deb $ISO $RELEASE $COMPONENTS" > /etc/apt/sources.list
[ -n "$MIRROR" ] && echo "deb $MIRROR $RELEASE $COMPONENTS" >> /etc/apt/sources.list || true
- # add security.debian.org:
- case "$RELEASE" in
- unstable|sid) ;; # no security pool available
- *)
- echo "deb http://security.debian.org ${RELEASE}/updates $COMPONENTS" >> /etc/apt/sources.list
- ;;
- esac
else
if [ -n "$MIRROR" ] ; then
echo "deb $MIRROR $RELEASE $COMPONENTS" > /etc/apt/sources.list
else
if [ -n "$MIRROR" ] ; then
echo "deb $MIRROR $RELEASE $COMPONENTS" > /etc/apt/sources.list
- # add security.debian.org:
- case "$RELEASE" in
- unstable|sid) ;; # no security pool available
- *)
- echo "deb http://security.debian.org ${RELEASE}/updates $COMPONENTS" >> /etc/apt/sources.list
- ;;
- esac
fi
fi
fi
fi
+
+ # add security.debian.org:
+ case "$RELEASE" in
+ unstable|sid) ;; # no security pool available
+ *)
+ echo "deb http://security.debian.org ${RELEASE}/updates $COMPONENTS" >> /etc/apt/sources.list
+ ;;
+ esac
}
# }}}
}
# }}}