aboutsummaryrefslogtreecommitdiffstats
path: root/deploy
diff options
context:
space:
mode:
Diffstat (limited to 'deploy')
-rw-r--r--deploy/adapters/cobbler/kickstarts/default16.seed6
-rw-r--r--deploy/adapters/cobbler/snippets/preseed_post_install_network_config2
-rw-r--r--deploy/rename_nics.py2
3 files changed, 8 insertions, 2 deletions
diff --git a/deploy/adapters/cobbler/kickstarts/default16.seed b/deploy/adapters/cobbler/kickstarts/default16.seed
index 091b78f1..af6c9c39 100644
--- a/deploy/adapters/cobbler/kickstarts/default16.seed
+++ b/deploy/adapters/cobbler/kickstarts/default16.seed
@@ -140,6 +140,12 @@ d-i cdrom-detect/eject boolean false
d-i preseed/late_command string \
in-target sed -i '$a UseDNS no' /etc/ssh/sshd_config; \
in-target sed -i 's/.*GSSAPIAuthentication.*/GSSAPIAuthentication no/g' /etc/ssh/sshd_config; \
+in-target sed -i '$d' /usr/share/initramfs-tools/scripts/local-top/lvm2; \
+in-target echo "lvm vgchange -ay" >> /usr/share/initramfs-tools/scripts/local-top/lvm2; \
+in-target echo "exit 0" >> /usr/share/initramfs-tools/scripts/local-top/lvm2; \
+in-target touch /etc/initramfs-tools/scripts/local-top/lvm2; \
+in-target chmod 777 /etc/initramfs-tools/scripts/local-top/lvm2; \
+in-target echo "vgchange -a y" >> /etc/initramfs-tools/scripts/local-top/lvm2; \
wget -O- \
http://$http_server/cblr/svc/op/script/$what/$name/?script=preseed_late_default | \
chroot /target /bin/sh -s; cp /target/etc/network/interfaces /etc/network/interfaces; \
diff --git a/deploy/adapters/cobbler/snippets/preseed_post_install_network_config b/deploy/adapters/cobbler/snippets/preseed_post_install_network_config
index cb79c556..42df3cb6 100644
--- a/deploy/adapters/cobbler/snippets/preseed_post_install_network_config
+++ b/deploy/adapters/cobbler/snippets/preseed_post_install_network_config
@@ -441,7 +441,7 @@ echo "" >> /etc/network/interfaces
used_logical_interface_$iname=$iname
- #if $iface_type in ("slave","bond_slave","bridge_slave","bonded_bridge_slave")
+ #if $iface_type in ("slave","bond_slave","bridge_slave","bonded_bridge_slave","static")
#set $static = 1
#end if
echo "auto $iname" >> /etc/network/interfaces
diff --git a/deploy/rename_nics.py b/deploy/rename_nics.py
index 505d6bcf..6163188e 100644
--- a/deploy/rename_nics.py
+++ b/deploy/rename_nics.py
@@ -17,7 +17,7 @@ def rename_nics(dha_info, rsa_file, compass_ip):
exec_cmd("ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \
-i %s root@%s \
- 'cobbler system edit --name=%s --interface=%s --mac=%s'" \
+ 'cobbler system edit --name=%s --interface=%s --mac=%s --interface_type=static'" \
% (rsa_file, compass_ip, host_name, nic_name, mac))
exec_cmd("ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \