...
 
Commits (6)
......@@ -36,41 +36,34 @@ EOF
echo 'startup_states: highstate' > /etc/salt/minion.d/startup.conf
# Update to Testing
cat > /etc/apt/sources.list <<EOF
deb http://linux-ftp.jf.intel.com/pub/mirrors/debian/ testing main
deb-src http://linux-ftp.jf.intel.com/pub/mirrors/debian/ testing main
EOF
# Add our nfs mount to fstab
echo 'otc-mesa-ci.local:/srv/jenkins /mnt/jenkins nfs _netdev,auto,async,comment=systemd.automount 0 0' >> /etc/fstab
apt-get update -y
for _ in `seq 3`; do
DEBIAN_FRONTEND=noninteractive \
APT_LISTCHANGES_FRONTEND=mail \
apt-get -o Dpkg::Options::="--force-confdef" \
--force-yes -fuy dist-upgrade
done
# Debian testing has a bug that causes systemd to be uinstalled, but we want
# it.
DEBIAN_FRONTEND=noninteractive \
APT_LISTCHANGES_FRONTEND=mail \
apt-get -o Dpkg::Options::="--force-confdef" \
--force-yes -fuy install linux-image-amd64 systemd systemd-sysv
# Create a systemd .network file for the network interfac
name=$(ip addr show scope link up | grep -v DOWN | grep UP | awk '{print $2}' | sed 's@:@@')
mkdir -p /etc/systemd/network
cat > /etc/systemd/network/eth0.network << EOF
cat > "/etc/systemd/network/${name}.network" << EOF
[Match]
Name=eth0
Name=${name}
[Network]
DHCP=yes
EOF
# setup resolve for systemd-resolved
rm /etc/resolv.conf
ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf
# Remove interfaces to keep debian's interfaces from coming up as well as systemd
rm /etc/network/interfaces
# Copy the loader from ${EFI}/debian/grubx64.efi to ${EFI}/boot/bootx64.efi
# This is a work-around for broken EFI implementations.
mkdir -p /boot/efi/EFI/boot/
cp /boot/efi/EFI/debian/grubx64.efi /boot/efi/EFI/boot/bootx64.efi
# Enable and disable some services
systemctl enable systemd-networkd systemd-resolved avahi-daemon salt-minion
systemctl disable networking
......@@ -25,48 +25,3 @@ menuentry 'Install' {
linux /install.amd/vmlinuz vga=788 --- quiet
initrd /install.amd/initrd.gz
}
menuentry 'Graphical install' {
set background_color=black
linux /install.amd/vmlinuz vga=788 --- quiet
initrd /install.amd/gtk/initrd.gz
}
submenu 'Advanced options ...' {
set menu_color_normal=cyan/blue
set menu_color_highlight=white/blue
set theme=/boot/grub/theme/1-1
menuentry '... Expert install' {
set background_color=black
linux /install.amd/vmlinuz priority=low vga=788 ---
initrd /install.amd/initrd.gz
}
menuentry '... Rescue mode' {
set background_color=black
linux /install.amd/vmlinuz vga=788 rescue/enable=true --- quiet
initrd /install.amd/initrd.gz
}
menuentry '... Automated install' {
set background_color=black
linux /install.amd/vmlinuz auto=true priority=critical vga=788 --- quiet
initrd /install.amd/initrd.gz
}
menuentry '... Graphical expert install' {
set background_color=black
linux /install.amd/vmlinuz priority=low vga=788 ---
initrd /install.amd/gtk/initrd.gz
}
menuentry '... Graphical rescue mode' {
set background_color=black
linux /install.amd/vmlinuz vga=788 rescue/enable=true --- quiet
initrd /install.amd/gtk/initrd.gz
}
menuentry '... Graphical automated install' {
set background_color=black
linux /install.amd/vmlinuz auto=true priority=critical vga=788 --- quiet
initrd /install.amd/gtk/initrd.gz
}
}
menuentry 'Install with speech synthesis' {
set background_color=black
linux /install.amd/vmlinuz vga=788 speakup.synth=soft --- quiet
initrd /install.amd/gtk/initrd.gz
}
# D-I config version 2.0
# search path for the c32 support libraries (libcom32, libutil etc.)
path
include menu.cfg
include txt.cfg
default vesamenu.c32
prompt 0
timeout 1
......@@ -89,7 +89,7 @@ d-i grub-installer/bootdev string /dev/<disk>
# These are needed for salt to finish provisioning the system
# XXX: Tsocks is required here because it is currently only in debian stable
# and sid, but not testing for "reasons"
d-i pkgsel/include string salt-minion avahi-daemon tsocks
d-i pkgsel/include string salt-minion avahi-daemon
d-i preseed/late_command string \
cp /cdrom/finalize.sh /target/finalize.sh; in-target ./finalize.sh
......