sipwise
/
deployment-iso
mirror of https://github.com/sipwise/deployment-iso.git
1
0
Fork 0
Code Issues Releases Wiki Activity

TT#36453 Remove obsolete things of old releases

Browse Source 
Remove workarounds which were used to install old debian releases/ngcp releases.
Remove old versions of Debian from installation list.
Add trailing space to the end of boot parameters to make manual modification
easier.

Change-Id: I201dac4a1d546a83743823cb9dff3546209e6404
changes/53/20953/5
Mykola Malkov 8 years ago
parent 4359ca2910
commit ba560b658c
3 changed files with 20 additions and 325 deletions
Show Stats Download Patch File Download Diff File

79
grub.cfg
Unescape View File

@ -12,21 +12,21 @@ menuentry "Rescue system boot (%VERSION%)" {
menuentry "##VERSION## sip:providerCE" {
echo 'Loading kernel...'
linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcpce ssh=sipwise debianrelease=##DIST## scripts ngcphostname=spce ngcpvers=##VERSION## nodhcp
linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcpce ssh=sipwise debianrelease=##DIST## scripts ngcphostname=spce ngcpvers=##VERSION## nodhcp
echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img
}
menuentry "##VERSION## sip:providerPRO (sp1)" {
echo 'Loading kernel...'
linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcppro ssh=sipwise debianrelease=##DIST## scripts ngcpsp1 ngcpvers=##VERSION## nodhcp
linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcppro ssh=sipwise debianrelease=##DIST## scripts ngcpsp1 ngcpvers=##VERSION## nodhcp
echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img
}
menuentry "##VERSION## sip:providerPRO (sp2)" {
echo 'Loading kernel...'
linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcppro ssh=sipwise debianrelease=##DIST## scripts ngcpsp2 ngcpvers=##VERSION## nodhcp
linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcppro ssh=sipwise debianrelease=##DIST## scripts ngcpsp2 ngcpvers=##VERSION## nodhcp
echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img
}
@ -39,22 +39,15 @@ menuentry "##VERSION## sip:Carrier (web01a)" {
}
## submenus
submenu "Install Debian ... ->" --class=submenu {
submenu "Install Debian stretch ... ->" --class=submenu {
menuentry "Install Debian/stretch 64bit - DHCP" {
menuentry "Install Debian/stretch 64bit" {
echo 'Loading kernel...'
linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 nongcp ssh=sipwise debianrelease=stretch scripts
echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img
}
menuentry "Install Debian/stretch 64bit - static NW" {
echo 'Loading kernel...'
linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 nongcp ssh=sipwise debianrelease=stretch scripts dns=92.42.136.30,92.42.136.31 nodhcp ip=10.15.20.123::10.15.20.1:255.255.255.0:debian:eth0:off
echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img
}
menuentry "Install Debian/stretch 64bit - Puppet" {
echo 'Loading kernel...'
linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 nongcp ssh=sipwise debianrelease=stretch scripts puppetenv=production dns=92.42.136.30,92.42.136.31 ip=10.15.20.123::10.15.20.1:255.255.255.0:puppet-client42:eth0:off
@ -62,68 +55,6 @@ menuentry "Install Debian/stretch 64bit - Puppet" {
initrd /boot/%SHORT_NAME%/initrd.img
}
menuentry "Install Debian/jessie 64bit - DHCP" {
echo 'Loading kernel...'
linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 nongcp ssh=sipwise debianrelease=jessie scripts
echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img
}
menuentry "Install Debian/jessie 64bit - static NW" {
echo 'Loading kernel...'
linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 nongcp ssh=sipwise debianrelease=jessie scripts dns=92.42.136.30,92.42.136.31 nodhcp ip=10.15.20.123::10.15.20.1:255.255.255.0:debian:eth0:off
echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img
}
menuentry "Install Debian/jessie 64bit - Puppet" {
echo 'Loading kernel...'
linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 nongcp ssh=sipwise debianrelease=jessie scripts puppetenv=production dns=92.42.136.30,92.42.136.31 ip=10.15.20.123::10.15.20.1:255.255.255.0:puppet-client42:eth0:off
echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img
}
menuentry "Install Debian/wheezy 64bit - DHCP" {
echo 'Loading kernel...'
linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 nongcp ssh=sipwise debianrelease=wheezy scripts
echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img
}
menuentry "Install Debian/wheezy 64bit - static NW" {
echo 'Loading kernel...'
linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 nongcp ssh=sipwise debianrelease=wheezy scripts dns=92.42.136.30,92.42.136.31 nodhcp ip=10.15.20.123::10.15.20.1:255.255.255.0:debian:eth0:off
echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img
}
menuentry "Install Debian/wheezy 64bit - Puppet" {
echo 'Loading kernel...'
linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 nongcp ssh=sipwise debianrelease=wheezy scripts puppetenv=production dns=92.42.136.30,92.42.136.31 ip=10.15.20.123::10.15.20.1:255.255.255.0:puppet-client42:eth0:off
echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img
}
menuentry "Install Debian/squeeze 64bit - DHCP" {
echo 'Loading kernel...'
linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 nongcp ssh=sipwise debianrelease=squeeze scripts
echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img
}
menuentry "Install Debian/squeeze 64bit - static NW" {
echo 'Loading kernel...'
linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 nongcp ssh=sipwise debianrelease=squeeze scripts dns=92.42.136.30,92.42.136.31 nodhcp ip=10.15.20.123::10.15.20.1:255.255.255.0:debian:eth0:off
echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img
}
menuentry "Install Debian/squeeze 64bit - Puppet" {
echo 'Loading kernel...'
linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 nongcp ssh=sipwise debianrelease=squeeze scripts puppetenv=production dns=92.42.136.30,92.42.136.31 ip=10.15.20.123::10.15.20.1:255.255.255.0:puppet-client42:eth0:off
echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img
}
} # submenu "Install Debian ... ->"
source /boot/grub/addons.cfg

150
isolinux.cfg
Unescape View File

@ -56,7 +56,7 @@ menu separator
label ce##VERSION##
menu label ##VERSION## sip:providerCE
kernel /boot/%SHORT_NAME%/vmlinuz
append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcpce ssh=sipwise debianrelease=##DIST## scripts ngcphostname=spce ngcpvers=##VERSION## nodhcp
append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcpce ssh=sipwise debianrelease=##DIST## scripts ngcphostname=spce ngcpvers=##VERSION## nodhcp
text help
Install sip:provider community edition,
@ -66,7 +66,7 @@ label ce##VERSION##
label prosp1-##VERSION##
menu label ##VERSION## sip:providerPRO (sp1)
kernel /boot/%SHORT_NAME%/vmlinuz
append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcppro ssh=sipwise debianrelease=##DIST## scripts ngcpsp1 ngcpvers=##VERSION## nodhcp
append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcppro ssh=sipwise debianrelease=##DIST## scripts ngcpsp1 ngcpvers=##VERSION## nodhcp
text help
Install sip:provider
@ -77,7 +77,7 @@ label prosp1-##VERSION##
label prosp2-##VERSION##
menu label ##VERSION## sip:providerPRO (sp2)
kernel /boot/%SHORT_NAME%/vmlinuz
append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcppro ssh=sipwise debianrelease=##DIST## scripts ngcpsp2 ngcpvers=##VERSION## nodhcp
append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcppro ssh=sipwise debianrelease=##DIST## scripts ngcpsp2 ngcpvers=##VERSION## nodhcp
text help
Install sip:provider
@ -89,7 +89,7 @@ label prosp2-##VERSION##
label carrier##VERSION##
menu label ##VERSION## sip:Carrier (web01a)
kernel /boot/%SHORT_NAME%/vmlinuz
append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcppro ssh=sipwise debianrelease=##DIST## scripts ngcpsp1 ngcpfillcache ngcpvers=##VERSION## nodhcp ngcpnonwrecfg ngcpcrole=mgmt ngcphostname=web01a
append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcppro ssh=sipwise debianrelease=##DIST## scripts ngcpsp1 ngcpfillcache ngcpvers=##VERSION## nodhcp ngcpnonwrecfg ngcpcrole=mgmt ngcphostname=web01a
text help
Install sip:Carrier version ##VERSION##.
@ -102,7 +102,7 @@ label carrier##VERSION##
menu separator
menu begin debian-options
menu title Install specific Debian releases ...
menu title Install Debian stretch ...
label mainmenu
menu label ^Back to main menu...
@ -110,29 +110,13 @@ menu exit
menu separator
label stretch
menu label Install Debian/stretch 64bit - DHCP
menu label Install Debian/stretch 64bit
kernel /boot/%SHORT_NAME%/vmlinuz
append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 nongcp ssh=sipwise debianrelease=stretch scripts
text help
Install Debian stretch, 64bit.
Does NOT install sip:provider platform.
Retrieve network configuration via DHCP.
endtext
label stretchnw
menu label Install Debian/stretch 64bit - static NW
kernel /boot/%SHORT_NAME%/vmlinuz
append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 nongcp ssh=sipwise debianrelease=stretch scripts dns=92.42.136.30,92.42.136.31 nodhcp ip=10.15.20.123::10.15.20.1:255.255.255.0:debian:eth0:off
text help
Install Debian stretch, 64bit.
Does NOT install sip:provider platform.
Use static IP configuration, adjust
in boot command line if necessary.
endtext
label stretchpuppet
@ -150,128 +134,6 @@ label stretchpuppet
IP address,...)
endtext
label jessie
menu label Install Debian/jessie 64bit - DHCP
kernel /boot/%SHORT_NAME%/vmlinuz
append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 nongcp ssh=sipwise debianrelease=jessie scripts
text help
Install Debian jessie, 64bit.
Does NOT install sip:provider platform.
Retrieve network configuration via DHCP.
endtext
label jessienw
menu label Install Debian/jessie 64bit - static NW
kernel /boot/%SHORT_NAME%/vmlinuz
append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 nongcp ssh=sipwise debianrelease=jessie scripts dns=92.42.136.30,92.42.136.31 nodhcp ip=10.15.20.123::10.15.20.1:255.255.255.0:debian:eth0:off
text help
Install Debian jessie, 64bit.
Does NOT install sip:provider platform.
Use static IP configuration, adjust
in boot command line if necessary.
endtext
label jessiepuppet
menu label Install Debian/jessie 64bit - Puppet
kernel /boot/%SHORT_NAME%/vmlinuz
append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 nongcp ssh=sipwise debianrelease=jessie scripts puppetenv=production dns=92.42.136.30,92.42.136.31 ip=10.15.20.123::10.15.20.1:255.255.255.0:puppet-client42:eth0:off
text help
Install Debian jessie, 64bit using
integration in Puppet configuration
management environment.
Does NOT install sip:provider platform.
Please adjust command line (hostname,
IP address,...)
endtext
label wheezy
menu label Install Debian/wheezy 64bit - DHCP
kernel /boot/%SHORT_NAME%/vmlinuz
append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 nongcp ssh=sipwise debianrelease=wheezy scripts
text help
Install Debian wheezy, 64bit.
Does NOT install sip:provider platform.
Retrieve network configuration via DHCP.
endtext
label wheezynw
menu label Install Debian/wheezy 64bit - static NW
kernel /boot/%SHORT_NAME%/vmlinuz
append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 nongcp ssh=sipwise debianrelease=wheezy scripts dns=92.42.136.30,92.42.136.31 nodhcp ip=10.15.20.123::10.15.20.1:255.255.255.0:debian:eth0:off
text help
Install Debian wheezy, 64bit.
Does NOT install sip:provider platform.
Use static IP configuration, adjust
in boot command line if necessary.
endtext
label wheezypuppet
menu label Install Debian/wheezy 64bit - Puppet
kernel /boot/%SHORT_NAME%/vmlinuz
append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 nongcp ssh=sipwise debianrelease=wheezy scripts puppetenv=production dns=92.42.136.30,92.42.136.31 ip=10.15.20.123::10.15.20.1:255.255.255.0:puppet-client42:eth0:off
text help
Install Debian wheezy, 64bit using
integration in Puppet configuration
management environment.
Does NOT install sip:provider platform.
Please adjust command line (hostname,
IP address,...)
endtext
label squeeze
menu label Install Debian/squeeze 64bit - DHCP
kernel /boot/%SHORT_NAME%/vmlinuz
append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 nongcp ssh=sipwise debianrelease=squeeze scripts
text help
Install Debian squeeze, 64bit.
Does NOT install sip:provider platform.
Retrieve network configuration via DHCP.
endtext
label squeezenw
menu label Install Debian/squeeze 64bit - static NW
kernel /boot/%SHORT_NAME%/vmlinuz
append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 nongcp ssh=sipwise debianrelease=squeeze scripts dns=92.42.136.30,92.42.136.31 nodhcp ip=10.15.20.123::10.15.20.1:255.255.255.0:debian:eth0:off
text help
Install Debian squeeze, 64bit.
Does NOT install sip:provider platform.
Use static IP configuration, adjust
in boot command line if necessary.
endtext
label squeezepuppet
menu label Install Debian/squeeze 64bit - Puppet
kernel /boot/%SHORT_NAME%/vmlinuz
append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 nongcp ssh=sipwise debianrelease=squeeze scripts puppetenv=production dns=92.42.136.30,92.42.136.31 ip=10.15.20.123::10.15.20.1:255.255.255.0:puppet-client42:eth0:off
text help
Install Debian squeeze, 64bit using
integration in Puppet configuration
management environment.
Does NOT install sip:provider platform.
Please adjust command line (hostname,
IP address,...)
endtext
# back to main menu
label quit

116
templates/scripts/includes/deployment.sh
Unescape View File

@ -529,20 +529,6 @@ if checkBootParam ngcpnolvm ; then
LVM=false
fi
case "$SP_VERSION" in
2.*)
logit "Disabling LVM due to SP_VERSION [$SP_VERSION] matching 2.*"
LVM=false
;;
esac
case "$SP_VERSION" in
2.*|3.0|3.1|mr3.2*)
FILESYSTEM="ext3"
logit "Using filesystem $FILESYSTEM for sip:provider release ${SP_VERSION}"
;;
esac
# allow forcing LVM mode
if checkBootParam ngcplvm ; then
logit "Enabling LVM due to ngcplvm boot option"
@ -879,23 +865,6 @@ else
[ -n "$EADDR" ] || EADDR=$INSTALL_IP
fi
if "$CE_EDITION" ; then
case "$SP_VERSION" in
# we do not have a local mirror for lenny, so disable it
2.1) DEBIAN_RELEASE="lenny" ;;
2.2) DEBIAN_RELEASE="squeeze" ;;
2.4) DEBIAN_RELEASE="squeeze" ;;
2.5) DEBIAN_RELEASE="squeeze" ;;
2.6-rc1) DEBIAN_RELEASE="squeeze" ;;
2.6-rc2) DEBIAN_RELEASE="squeeze" ;;
2.6) DEBIAN_RELEASE="squeeze" ;;
2.7-rc2) DEBIAN_RELEASE="squeeze" ;;
2.7-rc3) DEBIAN_RELEASE="squeeze" ;;
2.7) DEBIAN_RELEASE="squeeze" ;;
2.8) DEBIAN_RELEASE="squeeze" ;;
esac
fi
set_deploy_status "settings"
### echo settings
@ -1342,41 +1311,19 @@ ca-certificates
#os-prober
EOF
# ifenslave-2.6 in jessie+ is a transitional dummy package that will disappear.
case "$DEBIAN_RELEASE" in
lenny|squeeze|wheezy)
PKG_IFENSLAVE="ifenslave-2.6"
;;
*)
PKG_IFENSLAVE="ifenslave"
;;
esac
echo "Adding ${PKG_IFENSLAVE} package (because we're installing ${DEBIAN_RELEASE})"
logit "Adding ${PKG_IFENSLAVE} package (because we're installing ${DEBIAN_RELEASE})"
echo "Adding ifenslave package (because we're installing ${DEBIAN_RELEASE})"
logit "Adding ifenslave package (because we're installing ${DEBIAN_RELEASE})"
cat >> /etc/debootstrap/packages << EOF
# support bonding
${PKG_IFENSLAVE}
ifenslave
EOF
# MT#8813 The linux-headers-2.6-amd64 package doesn't exist in jessie and newer
case "$DEBIAN_RELEASE" in
lenny|squeeze|wheezy)
echo "Adding linux-headers-2.6-amd64 package (because we're installing ${DEBIAN_RELEASE})"
logit "Adding linux-headers-2.6-amd64 package (because we're installing ${DEBIAN_RELEASE})"
cat >> /etc/debootstrap/packages << EOF
# required for dkms
linux-headers-2.6-amd64
EOF
;;
*)
echo "Adding linux-headers-amd64 package (because we're installing ${DEBIAN_RELEASE})"
logit "Adding linux-headers-amd64 package (because we're installing ${DEBIAN_RELEASE})"
cat >> /etc/debootstrap/packages << EOF
echo "Adding linux-headers-amd64 package (because we're installing ${DEBIAN_RELEASE})"
logit "Adding linux-headers-amd64 package (because we're installing ${DEBIAN_RELEASE})"
cat >> /etc/debootstrap/packages << EOF
# required for dkms
linux-headers-amd64
EOF
;;
esac
if "$LVM" ; then
cat >> /etc/debootstrap/packages << EOF
@ -1439,21 +1386,6 @@ if [ "$DEBIAN_RELEASE" != "jessie" ] ; then
echo "deb ${DBG_MIRROR} ${DEBIAN_RELEASE}-debug main contrib non-free" >> /etc/debootstrap/etc/apt/sources.list
fi
# GRUB versions until Debian/wheezy generate an invalid device.map
# entry if /dev/disk/by-id/lvm-pv-uuid-* is present, resulting in
# a GRUB installation failing with "error: no such disk" during boot.
# This is only a problem if we're using a virtio disk and deploying
# from a system running lvm2 v2.02.106 or newer.
if [ "${DISK}" = "vda" ] ; then
case "$DEBIAN_RELEASE" in
lenny|squeeze|wheezy)
echo "Applying /dev/disk/by-id/lvm-pv-uuid-* workaround for virtio disk and Debian release <= wheezy"
logit "Applying /dev/disk/by-id/lvm-pv-uuid-* workaround for virtio disk and Debian release <= wheezy"
rm -f /dev/disk/by-id/lvm-pv-uuid-*
;;
esac
fi
if [ "$DEBIAN_RELEASE" = "stretch" ] && [ ! -r /usr/share/debootstrap/scripts/stretch ] ; then
echo "Enabling stretch support for debootstrap via symlink to sid"
ln -s /usr/share/debootstrap/scripts/sid /usr/share/debootstrap/scripts/stretch
@ -1481,17 +1413,6 @@ fi
sync
mount "$ROOT_FS" "$TARGET"
# MT#13711
case "$DEBIAN_RELEASE" in
lenny|squeeze)
echo "Setting up /etc/apt/apt.conf.d/42_ngcp_aptproxy to avoid random 'Hash Sum mismatch' failures."
logit "Setting up /etc/apt/apt.conf.d/42_ngcp_aptproxy to avoid random 'Hash Sum mismatch' failures."
echo "// NGCP_MANAGED_FILE - do not remove this line if it should be automatically handled" > "${TARGET}/etc/apt/apt.conf.d/42_ngcp_aptproxy"
echo "// Installed via 'deployment.sh' on $(date)" >> "${TARGET}/etc/apt/apt.conf.d/42_ngcp_aptproxy"
echo 'Acquire::http::Pipeline-Depth "0";' >> "${TARGET}/etc/apt/apt.conf.d/42_ngcp_aptproxy"
;;
esac
# MT#7805
if "$NGCP_INSTALLER" ; then
cat << EOT | augtool --root="$TARGET"
@ -1507,13 +1428,6 @@ cat >> "${TARGET}/etc/fstab" << EOF
$SWAP_PARTITION none swap sw,pri=0 0 0
EOF
case "$DEBIAN_RELEASE" in
lenny|squeeze|wheezy)
echo "Removing packages which debootstrap installs but d-i doesn't"
chroot $TARGET apt-get --purge -y remove tcpd xauth
;;
esac
if "$PRO_EDITION" ; then
echo "Pro edition: keeping firmware* packages."
else
@ -2142,13 +2056,8 @@ vagrant_configuration() {
# bzip2, linux-headers-amd64 and make are required for VirtualBox Guest Additions installer
# less + sudo are required for Vagrant itself
echo "Installing software for VirtualBox Guest Additions installer"
# there's no linux-headers-amd64 package in squeeze:
case "$DEBIAN_RELEASE" in
squeeze) local linux_headers_package="linux-headers-2.6-amd64" ;;
*) local linux_headers_package="linux-headers-amd64" ;;
esac
if ! chroot "$TARGET" apt-get -y install bzip2 less ${linux_headers_package} make sudo ; then
die "Error: failed to install 'bzip2 less ${linux_headers_package} make sudo' packages."
if ! chroot "$TARGET" apt-get -y install bzip2 less linux-headers-amd64 make sudo ; then
die "Error: failed to install 'bzip2 less linux-headers-amd64 make sudo' packages."
fi
vagrant_ssh_pub_key='/var/tmp/id_rsa_sipwise.pub'
@ -2178,14 +2087,7 @@ vagrant_configuration() {
mkdir -p "${TARGET}/root/.ssh/"
cat "${vagrant_ssh_pub_key}" >> "${TARGET}/root/.ssh/sipwise_vagrant_key"
chroot "${TARGET}" chmod 0600 /root/.ssh/sipwise_vagrant_key
case "${DEBIAN_RELEASE}" in
squeeze)
sed -i 's|^[#\s]*AuthorizedKeysFile.*$|AuthorizedKeysFile %h/.ssh/sipwise_vagrant_key|g' "${TARGET}/etc/ssh/sshd_config"
;;
*)
sed -i 's|^[#\s]*\(AuthorizedKeysFile.*\)$|\1 %h/.ssh/sipwise_vagrant_key|g' "${TARGET}/etc/ssh/sshd_config"
;;
esac
sed -i 's|^[#\s]*\(AuthorizedKeysFile.*\)$|\1 %h/.ssh/sipwise_vagrant_key|g' "${TARGET}/etc/ssh/sshd_config"
# see https://github.com/mitchellh/vagrant/issues/1673
# and https://bugs.launchpad.net/ubuntu/+source/xen-3.1/+bug/1167281

Write Preview
Loading…
Cancel
Save