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

MT#6253 Support Debian installations, sync isolinux<->grub boot splashes

Browse Source 
Also update deployment.sh while at it
changes/06/606/1
Michael Prokop 11 years ago
parent c38b3f3edc
commit 7d79672fac
4 changed files with 69 additions and 12 deletions
Show Stats Download Patch File Download Diff File

46
templates-ce/boot/grub/grub.cfg
Unescape View File

@ -9,20 +9,62 @@ menuentry "Rescue system boot (%VERSION%)" {
initrd /boot/%SHORT_NAME%/initrd.img initrd /boot/%SHORT_NAME%/initrd.img
} }
menuentry "Install sip:providerCE - DHCP" { menuentry "Install latest sip:providerCE - DHCP" {
echo 'Loading kernel...' echo 'Loading kernel...'
linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce noquick distri=grml-sipwise ngcpce ssh=sipwise debianrelease=wheezy scripts ngcphostname=spce linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce noquick distri=grml-sipwise ngcpce ssh=sipwise debianrelease=wheezy scripts ngcphostname=spce
echo 'Loading initrd...' echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img initrd /boot/%SHORT_NAME%/initrd.img
} }
menuentry "Install sip:providerCE - static NW config" { menuentry "Install latest sip:providerCE - static NW config" {
echo 'Loading kernel...' echo 'Loading kernel...'
linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce noquick distri=grml-sipwise ngcpce ssh=sipwise debianrelease=wheezy scripts ngcphostname=spce ip=192.168.1.123::192.168.1.1:255.255.255.0:spce:eth0:off dns=8.8.8.8 linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce noquick distri=grml-sipwise ngcpce ssh=sipwise debianrelease=wheezy scripts ngcphostname=spce ip=192.168.1.123::192.168.1.1:255.255.255.0:spce:eth0:off dns=8.8.8.8
echo 'Loading initrd...' echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img initrd /boot/%SHORT_NAME%/initrd.img
} }
menuentry "Install 2.8 LTS sip:providerCE - DHCP" {
echo 'Loading kernel...'
linux /boot/%SHORT_NAME%/vmlinuz initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce noquick distri=grml-sipwise ngcpce ssh=sipwise debianrelease=wheezy ngcpvers=2.8 scripts ngcphostname=spce
echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img
}
menuentry "Install 2.8 LTS sip:providerCE - static NW" {
echo 'Loading kernel...'
linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce noquick distri=grml-sipwise ngcpce ssh=sipwise debianrelease=wheezy ngcpvers=2.8 scripts ngcphostname=spce ip=192.168.1.100::192.168.1.1:255.255.255.0:spce:eth0:off dns=8.8.8.8
echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img
}
menuentry "Install plain 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 vga=791 quiet nomce noquick distri=grml-sipwise ssh=sipwise debianrelease=squeeze scripts
echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img
}
menuentry "Install plain 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 vga=791 quiet nomce noquick distri=grml-sipwise ssh=sipwise debianrelease=squeeze scripts ip=192.168.1.100::192.168.1.1:255.255.255.0:debian:eth0:off dns=8.8.8.8
echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img
}
menuentry "Install plain 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 vga=791 quiet nomce noquick distri=grml-sipwise ssh=sipwise debianrelease=wheezy scripts
echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img
}
menuentry "Install plain 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 vga=791 quiet nomce noquick distri=grml-sipwise ssh=sipwise debianrelease=wheezy scripts ip=192.168.1.100::192.168.1.1:255.255.255.0:debian:eth0:off dns=8.8.8.8
echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img
}
source /boot/grub/addons.cfg source /boot/grub/addons.cfg
source /boot/grub/footer.cfg source /boot/grub/footer.cfg

12
templates-ce/boot/isolinux/isolinux.cfg
Unescape View File

@ -114,8 +114,7 @@ menu separator
label squeeze label squeeze
menu label Install plain Debian/squeeze 64bit - DHCP menu label Install plain Debian/squeeze 64bit - DHCP
kernel /boot/%SHORT_NAME%/vmlinuz 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 vga=791 quiet nomce nongcp ssh=sipwise append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce noquick distri=grml-sipwise ssh=sipwise debianrelease=squeeze scripts
debianrelease=squeeze scripts
text help text help
Install Debian squeeze, 64bit. Install Debian squeeze, 64bit.
@ -130,8 +129,7 @@ debianrelease=squeeze scripts
label squeezenw label squeezenw
menu label Install plain Debian/squeeze 64bit - static NW menu label Install plain Debian/squeeze 64bit - static NW
kernel /boot/%SHORT_NAME%/vmlinuz 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 vga=791 quiet nomce nongcp ssh=sipwise append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce noquick distri=grml-sipwise ssh=sipwise debianrelease=squeeze scripts ip=192.168.1.100::192.168.1.1:255.255.255.0:debian:eth0:off dns=8.8.8.8
debianrelease=squeeze scripts ip=192.168.1.100::192.168.1.1:255.255.255.0:debian:eth0:off dns=8.8.8.8
text help text help
Install Debian squeeze, 64bit. Install Debian squeeze, 64bit.
@ -146,8 +144,7 @@ debianrelease=squeeze scripts ip=192.168.1.100::192.168.1.1:255.255.255.0:debian
label wheezy label wheezy
menu label Install plain Debian/wheezy 64bit - DHCP menu label Install plain Debian/wheezy 64bit - DHCP
kernel /boot/%SHORT_NAME%/vmlinuz 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 vga=791 quiet nomce nongcp ssh=sipwise append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce noquick distri=grml-sipwise ssh=sipwise debianrelease=wheezy scripts
debianrelease=wheezy scripts
text help text help
Install Debian wheezy, 64bit. Install Debian wheezy, 64bit.
@ -162,8 +159,7 @@ debianrelease=wheezy scripts
label wheezynw label wheezynw
menu label Install plain Debian/wheezy 64bit - static NW menu label Install plain Debian/wheezy 64bit - static NW
kernel /boot/%SHORT_NAME%/vmlinuz 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 vga=791 quiet nomce nongcp ssh=sipwise append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce noquick distri=grml-sipwise ssh=sipwise debianrelease=wheezy scripts ip=192.168.1.100::192.168.1.1:255.255.255.0:debian:eth0:off dns=8.8.8.8
debianrelease=wheezy scripts ip=192.168.1.100::192.168.1.1:255.255.255.0:debian:eth0:off dns=8.8.8.8
text help text help
Install Debian wheezy, 64bit. Install Debian wheezy, 64bit.

19
templates-ce/scripts/includes/deployment.sh
Unescape View File

@ -56,6 +56,7 @@ VAGRANT=false
ADJUST_FOR_LOW_PERFORMANCE=false ADJUST_FOR_LOW_PERFORMANCE=false
ENABLE_VM_SERVICES=false ENABLE_VM_SERVICES=false
FILESYSTEM="ext4" FILESYSTEM="ext4"
SYSTEMD=false
if [ -L /sys/block/vda ] ; then if [ -L /sys/block/vda ] ; then
export DISK=vda # will be configured as /dev/vda export DISK=vda # will be configured as /dev/vda
@ -410,6 +411,11 @@ fi
if checkBootParam enablevmservices ; then if checkBootParam enablevmservices ; then
ENABLE_VM_SERVICES=true ENABLE_VM_SERVICES=true
fi fi
if checkBootParam ngcpsystemd ; then
logit "Enabling systemd support as requested via boot option ngcpsystemd"
SYSTEMD=true
fi
## }}} ## }}}
## interactive mode {{{ ## interactive mode {{{
@ -922,6 +928,19 @@ cp /etc/apt/trusted.gpg.d/sipwise.gpg "\${MNTPOINT}"/etc/apt/trusted.gpg.d/
EOF EOF
chmod 775 /etc/debootstrap/pre-scripts/install-sipwise-key.sh chmod 775 /etc/debootstrap/pre-scripts/install-sipwise-key.sh
if "$SYSTEMD" ; then
logit "Enabling systemd installation via grml-debootstrap"
mkdir -p /etc/debootstrap/scripts/
cat > /etc/debootstrap/scripts/systemd.sh << EOF
#!/bin/bash
# installed via deployment.sh
mount "$ROOT_FS" "$TARGET"
echo 'Yes, do as I say!' | chroot $TARGET apt-get install --force-yes -y systemd-sysv sysvinit-
umount "$TARGET"
EOF
chmod 775 /etc/debootstrap/scripts/systemd.sh
fi
# NOTE: we use the debian.sipwise.com CNAME by intention here # NOTE: we use the debian.sipwise.com CNAME by intention here
# to avoid conflicts with apt-pinning, preferring deb.sipwise.com # to avoid conflicts with apt-pinning, preferring deb.sipwise.com
# over official Debian # over official Debian

4
templates-ce/scripts/main.sh
Unescape View File

@ -65,8 +65,8 @@ report_ssh_password() {
} }
deploy() { deploy() {
# deploy only if we have the ngcpce boot option present # deploy only if we have the ngcpce or debianrelease boot option present
if ! grep -q ngcpce /proc/cmdline ; then if ! grep -q ngcpce /proc/cmdline && ! grep -q debianrelease /proc/cmdline ; then
return 0 return 0
fi fi

Write Preview
Loading…
Cancel
Save