projects
/
grml-debootstrap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Install os-prober by default.
[grml-debootstrap.git]
/
chroot-script
diff --git
a/chroot-script
b/chroot-script
index
17447ff
..
470a111
100755
(executable)
--- a/
chroot-script
+++ b/
chroot-script
@@
-20,7
+20,7
@@
if [ -x /usr/bin/aptitude ] ; then
APTINSTALL="aptitude -y --without-recommends install $DPKG_OPTIONS"
APTUPDATE='aptitude update'
else
APTINSTALL="aptitude -y --without-recommends install $DPKG_OPTIONS"
APTUPDATE='aptitude update'
else
- APTINSTALL="apt-get --force-yes -y install $DPKG_OPTIONS"
+ APTINSTALL="apt-get --force-yes -y
--no-install-recommends
install $DPKG_OPTIONS"
APTUPDATE='apt-get update'
fi
APTUPDATE='apt-get update'
fi
@@
-61,9
+61,23
@@
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
}