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:
9c1ec11
)
add a fallback mirror to be added in case when a local mirror is removed
author
Evgeni Golov
<evgeni@grml.org>
Fri, 3 Aug 2012 11:16:03 +0000
(13:16 +0200)
committer
Michael Prokop
<mika@grml.org>
Tue, 14 Aug 2012 17:04:18 +0000
(19:04 +0200)
chroot-script
patch
|
blob
|
history
grml-debootstrap
patch
|
blob
|
history
diff --git
a/chroot-script
b/chroot-script
index
6e1a049
..
89f0f8d
100755
(executable)
--- a/
chroot-script
+++ b/
chroot-script
@@
-113,6
+113,8
@@
remove_chrootmirror() {
echo "Removing local mirror (${MIRROR}) from sources.list."
TMP_MIRROR=$(echo "$MIRROR" |sed 's#/#\\/#g')
sed -i "/deb $TMP_MIRROR $RELEASE $COMPONENTS/ D" /etc/apt/sources.list
echo "Removing local mirror (${MIRROR}) from sources.list."
TMP_MIRROR=$(echo "$MIRROR" |sed 's#/#\\/#g')
sed -i "/deb $TMP_MIRROR $RELEASE $COMPONENTS/ D" /etc/apt/sources.list
+ echo "Adding fallback mirror entry (${FALLBACK_MIRROR}) to sources.list instead."
+ echo "deb $FALLBACK_MIRROR $RELEASE $COMPONENTS" >> /etc/apt/sources.list
fi
fi
}
fi
fi
}
diff --git
a/grml-debootstrap
b/grml-debootstrap
index
3085637
..
cb98aeb
100755
(executable)
--- a/
grml-debootstrap
+++ b/
grml-debootstrap
@@
-20,12
+20,13
@@
DEBCONF='yes'
DEBIAN_FRONTEND='noninteractive'
DEBOOTSTRAP='debootstrap'
EXTRAPACKAGES='yes'
DEBIAN_FRONTEND='noninteractive'
DEBOOTSTRAP='debootstrap'
EXTRAPACKAGES='yes'
+FALLBACK_MIRROR='http://cdn.debian.net/debian'
FORCE=''
HOSTNAME='grml'
INITRD='yes'
INSTALL_NOTES='/etc/debootstrap/install_notes'
LOCALES='yes'
FORCE=''
HOSTNAME='grml'
INITRD='yes'
INSTALL_NOTES='/etc/debootstrap/install_notes'
LOCALES='yes'
-MIRROR=
'http://cdn.debian.net/debian'
+MIRROR=
"$FALLBACK_MIRROR"
MKFS='mkfs.ext3'
PACKAGES='yes'
PRE_SCRIPTS='yes'
MKFS='mkfs.ext3'
PACKAGES='yes'
PRE_SCRIPTS='yes'
@@
-1088,6
+1089,7
@@
preparechroot() {
[ -n "$DEBIAN_FRONTEND" ] && echo "DEBIAN_FRONTEND=\"$DEBIAN_FRONTEND\"" >> $CHROOT_VARIABLES
[ -n "$DEBOOTSTRAP" ] && echo "DEBOOTSTRAP=\"$DEBOOTSTRAP\"" >> $CHROOT_VARIABLES
[ -n "$EXTRAPACKAGES" ] && echo "EXTRAPACKAGES=\"$EXTRAPACKAGES\"" >> $CHROOT_VARIABLES
[ -n "$DEBIAN_FRONTEND" ] && echo "DEBIAN_FRONTEND=\"$DEBIAN_FRONTEND\"" >> $CHROOT_VARIABLES
[ -n "$DEBOOTSTRAP" ] && echo "DEBOOTSTRAP=\"$DEBOOTSTRAP\"" >> $CHROOT_VARIABLES
[ -n "$EXTRAPACKAGES" ] && echo "EXTRAPACKAGES=\"$EXTRAPACKAGES\"" >> $CHROOT_VARIABLES
+ [ -n "$FALLBACK_MIRROR" ] && echo "FALLBACK_MIRROR=\"$FALLBACK_MIRROR\"" >> $CHROOT_VARIABLES
[ -n "$FORCE" ] && echo "FORCE=\"$FORCE\"" >> $CHROOT_VARIABLES
[ -n "$GRMLREPOS" ] && echo "GRMLREPOS=\"$GRMLREPOS\"" >> $CHROOT_VARIABLES
[ -n "$GRUB" ] && echo "GRUB=\"$GRUB\"" >> $CHROOT_VARIABLES
[ -n "$FORCE" ] && echo "FORCE=\"$FORCE\"" >> $CHROOT_VARIABLES
[ -n "$GRMLREPOS" ] && echo "GRMLREPOS=\"$GRMLREPOS\"" >> $CHROOT_VARIABLES
[ -n "$GRUB" ] && echo "GRUB=\"$GRUB\"" >> $CHROOT_VARIABLES