summaryrefslogtreecommitdiffstats
path: root/snippets
diff options
context:
space:
mode:
Diffstat (limited to 'snippets')
-rw-r--r--snippets/cobbler_register13
-rw-r--r--snippets/download_config_files10
-rw-r--r--snippets/func_register_if_enabled8
-rw-r--r--snippets/keep_ssh_host_keys44
-rw-r--r--snippets/main_partition_select1
-rw-r--r--snippets/network_config6
-rw-r--r--snippets/post_anamon23
-rw-r--r--snippets/post_install_network_config247
-rw-r--r--snippets/post_s390_reboot67
-rw-r--r--snippets/pre_anamon4
-rw-r--r--snippets/pre_install_network_config4
-rw-r--r--snippets/redhat_register6
12 files changed, 268 insertions, 165 deletions
diff --git a/snippets/cobbler_register b/snippets/cobbler_register
new file mode 100644
index 00000000..87dbb370
--- /dev/null
+++ b/snippets/cobbler_register
@@ -0,0 +1,13 @@
+# Begin cobbler registration
+#if $getVar('system_name','') == ''
+#if $str($getVar('register_new_installs','')) in [ "1", "true", "yes", "y" ]
+if [ -f "/usr/bin/cobbler-register" ]; then
+ cobbler-register --server=$server --fqdn '*AUTO*' --profile=$profile_name --batch
+fi
+#else
+# cobbler registration is disabled in /etc/cobbler/settings
+#end if
+#else
+# skipping for system-based installation
+#end if
+# End cobbler registration
diff --git a/snippets/download_config_files b/snippets/download_config_files
index f93a2a39..04443113 100644
--- a/snippets/download_config_files
+++ b/snippets/download_config_files
@@ -1,11 +1,7 @@
-
# Start download cobbler managed config files (if applicable)
-
#for $tkey, $tpath in $template_files.items()
-
#set $orig = $tpath
#set $tpath = $tpath.replace("_","__").replace("/","_")
-
#if $getVar("system_name","") != ""
#set $ttype = "system"
#set $tname = $system_name
@@ -13,14 +9,10 @@
#set $ttype = "profile"
#set $tname = $profile_name
#end if
-
#set $turl = "http://"+$http_server+"/cblr/svc/op/template/"+$ttype+"/"+$tname+"/path/"+$tpath
-
#if $orig.startswith("/")
+mkdir -p `dirname $orig`
wget "$turl" --output-document="$orig"
#end if
-
-
#end for
-
# End download cobbler managed config files (if applicable)
diff --git a/snippets/func_register_if_enabled b/snippets/func_register_if_enabled
index 0a93200a..4258fa33 100644
--- a/snippets/func_register_if_enabled
+++ b/snippets/func_register_if_enabled
@@ -4,15 +4,19 @@
/sbin/chkconfig --level 345 funcd on
-cat << EOFM >> /etc/func/minion.conf
+cat <<EOFM > /etc/func/minion.conf
[main]
log_level = INFO
acl_dir = /etc/func/minion-acl.d
+
+listen_addr =
+listen_port = 51234
EOFM
-cat << EOCM >> /etc/certmaster/minion.conf
+cat <<EOCM > /etc/certmaster/minion.conf
[main]
certmaster = $func_master
+certmaster_port = 51235
log_level = DEBUG
cert_dir = /etc/pki/certmaster
EOCM
diff --git a/snippets/keep_ssh_host_keys b/snippets/keep_ssh_host_keys
new file mode 100644
index 00000000..93a6fadb
--- /dev/null
+++ b/snippets/keep_ssh_host_keys
@@ -0,0 +1,44 @@
+#raw
+# Nifty trick to restore ssh keys without using a nochroot %post
+
+echo "Saving ssh host keys..." > /dev/ttyS0
+
+keys_found=no
+
+insmod /lib/jbd.o
+insmod /lib/ext3.o
+
+drives=$(list-harddrives | awk '{print $1}')
+for disk in $drives; do
+ DISKS="$DISKS $(fdisk -l /dev/$disk | awk '/^\/dev/{print $1}')"
+done
+
+for disk in $DISKS; do
+ name=$(basename $disk)
+ mkdir -p /tmp/$name /tmp/ssh
+ mount $disk /tmp/$name
+ [ $? -eq 0 ] || continue # Skip to the next partition if the mount fails
+
+ # Copy current ssh host keys out to be reused
+ if [ -d /tmp/${name}/etc/ssh ]; then
+ cp -a /tmp/${name}/etc/ssh/ssh_host* /tmp/ssh
+ keys_found="yes"
+ umount /tmp/$name
+ break
+ fi
+ umount /tmp/$name
+ rm -r /tmp/$name
+done
+
+# Loop until the ssh rpm is installed
+if [ "$keys_found" = "yes" ]; then
+ while : ; do
+ sleep 10
+ if [ -d /mnt/sysimage/etc/ssh ] ; then
+ cp -f /tmp/ssh/ssh_host* /mnt/sysimage/etc/ssh/
+ logger "SSH-HOST-KEY copied to newly installed system"
+ break
+ fi
+ done &
+fi
+#end
diff --git a/snippets/main_partition_select b/snippets/main_partition_select
index 2469657a..9d996e6f 100644
--- a/snippets/main_partition_select
+++ b/snippets/main_partition_select
@@ -1,4 +1,3 @@
# partition selection
-
%include /tmp/partinfo
diff --git a/snippets/network_config b/snippets/network_config
index 001aa506..ec1c9aca 100644
--- a/snippets/network_config
+++ b/snippets/network_config
@@ -47,6 +47,10 @@
#if $gateway != "":
#set $network_str = $network_str + " --gateway=" + $gateway
#end if
+ #if $name_servers and $name_servers[0] != "":
+ ## Anaconda only allows one nameserver
+ #set $network_str = $network_str + " --nameserver=" + $name_servers[0]
+ #end if
#else
#set $network_str = "--bootproto=none"
#end if
@@ -61,7 +65,7 @@
#end if
## network details are populated from the cobbler system object
#if $is_vlan == "false"
-network $network_str --device=eth$i --onboot=on
+network $network_str --device=$iname --onboot=on
#end if
#end for
#end if
diff --git a/snippets/post_anamon b/snippets/post_anamon
new file mode 100644
index 00000000..fc33cfa5
--- /dev/null
+++ b/snippets/post_anamon
@@ -0,0 +1,23 @@
+#if $str($getVar('anamon_enabled','')) == "1"
+
+## install anamon script
+wget -O /usr/local/sbin/anamon.py "http://$server/cobbler/aux/anamon.py"
+## install anamon system service
+wget -O /etc/rc.d/init.d/anamon "http://$server/cobbler/aux/anamon.init"
+
+## adjust permissions
+chmod 755 /etc/rc.d/init.d/anamon /usr/local/sbin/anamon.py
+test -d /selinux && restorecon /etc/rc.d/init.d/anamon /usr/local/sbin/anamon.py
+
+## enable the script
+chkconfig --add anamon
+
+## configure anamon service
+cat << __EOT__ > /etc/sysconfig/anamon
+COBBLER_SERVER="$server"
+COBBLER_PORT="$http_port"
+COBBLER_NAME="$name"
+LOGFILES="/var/log/boot.log /var/log/messages /var/log/dmesg"
+__EOT__
+
+#end if
diff --git a/snippets/post_install_network_config b/snippets/post_install_network_config
index 9e121f1a..e6839f77 100644
--- a/snippets/post_install_network_config
+++ b/snippets/post_install_network_config
@@ -1,16 +1,11 @@
# Start post_install_network_config generated code
-
#if $getVar("system_name","") != ""
-
## this is being provisioned by system records, not profile records
## so we can do the more complex stuff
-
## get the list of interface names
#set ikeys = $interfaces.keys()
-
#import re
#set $vlanpattern = $re.compile("[a-zA-Z0-9]+\.[0-9]+")
-
## Determine if we should use the MAC address to configure the interfaces first
## Only physical interfaces are required to have a MAC address
## Also determine the number of bonding devices we have, so we can set the
@@ -18,74 +13,61 @@
#
#set $configbymac = True
#set $numbondingdevs = 0
-
## =============================================================================
-
#for $iname in $ikeys
-
## look at the interface hash data for the specific interface
-
#set $idata = $interfaces[$iname]
-
## do not configure by mac address if we don't have one AND it's not for bonding/vlans
## as opposed to a "real" physical interface
-
#if $idata["mac_address"] == "" and not $vlanpattern.match($iname) and not $idata["bonding"].lower() == "master":
## we have to globally turn off the config by mac feature as we can't
## use it now
-
#set $configbymac = False
-
#end if
-
## count the number of bonding devices we have.
-
#if $idata["bonding"].lower() == "master"
#set $numbondingdevs += 1
#end if
#end for
-
## end looping through the interfaces to see which ones we need to configure.
-
## =============================================================================
-
#set $i = 0
-
## setup bonding if we have to
-
#if $numbondingdevs > 0
- echo "options bonding max_bonds=$numbondingdevs" >> /etc/modprobe.conf
+if [ -f "/etc/modprobe.conf" ]; then
+ echo "options bonding max_bonds=$numbondingdevs" >> /etc/modprobe.conf
+fi
#end if
-
## =============================================================================
-
## create a staging directory to build out our network scripts into
## make sure we preserve the loopback device
-
- mkdir /etc/sysconfig/network-scripts/cobbler
- cp /etc/sysconfig/network-scripts/ifcfg-lo /etc/sysconfig/network-scripts/cobbler/
-
+mkdir /etc/sysconfig/network-scripts/cobbler
+cp /etc/sysconfig/network-scripts/ifcfg-lo /etc/sysconfig/network-scripts/cobbler/
## =============================================================================
-
## configure the gateway if set up (this is global, not a per-interface setting)
-
#if $gateway != ""
- grep -v GATEWAY /etc/sysconfig/network > /etc/sysconfig/network.cobbler
- echo "GATEWAY=$gateway" >> /etc/sysconfig/network.cobbler
- rm -f /etc/sysconfig/network
- mv /etc/sysconfig/network.cobbler /etc/sysconfig/network
+grep -v GATEWAY /etc/sysconfig/network > /etc/sysconfig/network.cobbler
+echo "GATEWAY=$gateway" >> /etc/sysconfig/network.cobbler
+rm -f /etc/sysconfig/network
+mv /etc/sysconfig/network.cobbler /etc/sysconfig/network
+ #end if
+ ## =============================================================================
+ ## Configure the system's primary hostname. This is also passed to anaconda, but
+ ## anaconda doesn't seem to honour it in DHCP-setups.
+ #if $hostname != ""
+grep -v HOSTNAME /etc/sysconfig/network > /etc/sysconfig/network.cobbler
+echo "HOSTNAME=$hostname" >> /etc/sysconfig/network.cobbler
+rm -f /etc/sysconfig/network
+mv /etc/sysconfig/network.cobbler /etc/sysconfig/network
+ # Also set the hostname now, some applications require it (e.g.: if we're
+ # connecting to Puppet before a reboot).
+/bin/hostname $hostname
#end if
-
## =============================================================================
-
## now create the config file for each interface
-
#for $iname in $ikeys
-
# Start configuration for $iname
-
## create lots of variables to use later
-
#set $idata = $interfaces[$iname]
#set $mac = $idata["mac_address"].upper()
#set $static = $idata["static"]
@@ -97,9 +79,7 @@
#set $bonding_opts = $idata["bonding_opts"]
#set $devfile = "/etc/sysconfig/network-scripts/cobbler/ifcfg-" + $iname
#set $routesfile = "/etc/sysconfig/network-scripts/cobbler/route-" + $iname
-
## determine if this interface is for a VLAN
-
#if $vlanpattern.match($iname)
## If this is a VLAN interface, skip it, anaconda doesn't know
## about VLANs.
@@ -107,201 +87,176 @@
#else
#set $is_vlan = "false"
#end if
-
## if this is a bonded interface, configure it in modprobe.conf
-
#if $bonding.lower() == "master"
## Add required entry to modprobe.conf
- echo "alias $iname bonding" >> /etc/modprobe.conf.cobbler
+if [ -f "/etc/modprobe.conf" ]; then
+ echo "alias $iname bonding" >> /etc/modprobe.conf.cobbler
+fi
#end if
-
#if $configbymac and $is_vlan == "false" and $bonding.lower() != "master"
-
## This is the code path physical interfaces will follow.
-
## Get the current interface name
- IFNAME=\$(ifconfig -a | grep -i '$mac' | cut -d ' ' -f 1)
-
+IFNAME=\$(ifconfig -a | grep -i '$mac' | cut -d ' ' -f 1)
## Rename this interface in modprobe.conf
## FIXME: if both interfaces startwith eth this is wrong
-
- grep \$IFNAME /etc/modprobe.conf | sed "s/\$IFNAME/$iname/" >> /etc/modprobe.conf.cobbler
- grep -v \$IFNAME /etc/modprobe.conf >> /etc/modprobe.conf.new
- rm -f /etc/modprobe.conf
- mv /etc/modprobe.conf.new /etc/modprobe.conf
-
- echo "DEVICE=$iname" > $devfile
- echo "HWADDR=$mac" >> $devfile
- echo "ONBOOT=yes" >> $devfile
-
+if [ -f "/etc/modprobe.conf" ]; then
+ grep \$IFNAME /etc/modprobe.conf | sed "s/\$IFNAME/$iname/" >> /etc/modprobe.conf.cobbler
+ grep -v \$IFNAME /etc/modprobe.conf >> /etc/modprobe.conf.new
+ rm -f /etc/modprobe.conf
+ mv /etc/modprobe.conf.new /etc/modprobe.conf
+fi
+echo "DEVICE=$iname" > $devfile
+echo "HWADDR=$mac" >> $devfile
+echo "ONBOOT=yes" >> $devfile
#if $bonding.lower() == "slave" and $bonding_master != ""
-
## if needed setup bonding
-
- echo "SLAVE=yes" >> $devfile
- echo "MASTER=$bonding_master" >> $devfile
+echo "SLAVE=yes" >> $devfile
+echo "MASTER=$bonding_master" >> $devfile
## see Red Hat bugzilla 442339
- echo "HOTPLUG=no" >> $devfile
+echo "HOTPLUG=no" >> $devfile
#end if
-
- #if $static.lower() == "true" or $bonding.lower() == "slave"
-
+ #if $static or $bonding.lower() == "slave"
## for static or slave interfaces
-
#if $ip != "" and $bonding.lower() != "slave"
-
-
## Only configure static networking if an IP-address is
## configured
-
- echo "BOOTPROTO=static" >> $devfile
- echo "IPADDR=$ip" >> $devfile
+echo "BOOTPROTO=static" >> $devfile
+echo "IPADDR=$ip" >> $devfile
#if $netmask == ""
## Default to 255.255.255.0?
#set $netmask = "255.255.255.0"
#end if
- echo "NETMASK=$netmask" >> $devfile
-
+echo "NETMASK=$netmask" >> $devfile
#else
-
## Leave the interface unconfigured
## we don't have enough info for static configuration
- echo "BOOTPROTO=none" >> $devfile
-
+echo "BOOTPROTO=none" >> $devfile
#end if
-
#else
## this is a DHCP interface, much less work to do
- echo "BOOTPROTO=dhcp" >> $devfile
+echo "BOOTPROTO=dhcp" >> $devfile
#end if
-
#else if $is_vlan == "true" or $bonding.lower() == "master"
-
## Handle non-physical interfaces with special care. :)
-
- echo "# Cobbler generated non-physical interface" > $devfile
- echo "DEVICE=$iname" >> $devfile
-
+echo "# Cobbler generated non-physical interface" > $devfile
+echo "DEVICE=$iname" >> $devfile
#if $is_vlan == "true"
## configure vlan if required
- echo "VLAN=yes" >> $devfile
+echo "VLAN=yes" >> $devfile
#end if
-
#if $bonding.lower() == "master" and $bonding_opts != ""
## configure bonding if required
- cat >> $devfile << EOF
- BONDING_OPTS="$bonding_opts"
- EOF
+cat >> $devfile << EOF
+BONDING_OPTS="$bonding_opts"
+EOF
#end if
-
- echo "ONPARENT=yes" >> $devfile
-
- #if $static.lower() == "true"
-
+echo "ONPARENT=yes" >> $devfile
+ #if $static
## for static non-physical interfaces...
-
#if $ip != ""
## Only configure static networking if an IP-address is
## configured
- echo "BOOTPROTO=static" >> $devfile
- echo "IPADDR=$ip" >> $devfile
+echo "BOOTPROTO=static" >> $devfile
+echo "IPADDR=$ip" >> $devfile
#if $netmask == ""
## Default to 255.255.255.0?
#set $netmask = "255.255.255.0"
#end if
- echo "NETMASK=$netmask" >> $devfile
+echo "NETMASK=$netmask" >> $devfile
#else
## Leave the interface unconfigured
- echo "BOOTPROTO=none" >> $devfile
+echo "BOOTPROTO=none" >> $devfile
#end if
#else
- echo "BOOTPROTO=dhcp" >> $devfile
+echo "BOOTPROTO=dhcp" >> $devfile
#end if
#else if $configbymac == False
## We'll end up here when not all physical interfaces present for
## this system have MAC-addresses configured for them. We don't
## support interface renaming here.
-
- MAC=\$(ifconfig -a | grep $iname | awk '{ print \$5 }')
-
- echo "DEVICE=$iname" > $devfile
- echo "HWADDR=\$MAC" >> $devfile
- echo "ONBOOT=yes" >> $devfile
-
-
+MAC=\$(ifconfig -a | grep $iname | awk '{ print \$5 }')
+echo "DEVICE=$iname" > $devfile
+echo "HWADDR=\$MAC" >> $devfile
+echo "ONBOOT=yes" >> $devfile
#if $bonding.lower() == "slave" and $bonding_master != ""
-
## if needed setup bonding
-
- echo "SLAVE=yes" >> $devfile
- echo "MASTER=$bonding_master" >> $devfile
+echo "SLAVE=yes" >> $devfile
+echo "MASTER=$bonding_master" >> $devfile
## see Red Hat bugzilla 442339
- echo "HOTPLUG=no" >> $devfile
+echo "HOTPLUG=no" >> $devfile
#end if
-
- #if $static.lower() == "true" or $bonding.lower() == "slave"
-
+ #if $static or $bonding.lower() == "slave"
## for static or slave interfaces
-
#if $ip != "" and $bonding.lower() != "slave"
-
-
## Only configure static networking if an IP-address is
## configured
-
- echo "BOOTPROTO=static" >> $devfile
- echo "IPADDR=$ip" >> $devfile
+echo "BOOTPROTO=static" >> $devfile
+echo "IPADDR=$ip" >> $devfile
#if $netmask == ""
## Default to 255.255.255.0?
#set $netmask = "255.255.255.0"
#end if
- echo "NETMASK=$netmask" >> $devfile
-
+echo "NETMASK=$netmask" >> $devfile
#else
-
## Leave the interface unconfigured
## we don't have enough info for static configuration
- echo "BOOTPROTO=none" >> $devfile
-
+echo "BOOTPROTO=none" >> $devfile
#end if
-
#else
## this is a DHCP interface, much less work to do
- echo "BOOTPROTO=dhcp" >> $devfile
+echo "BOOTPROTO=dhcp" >> $devfile
#end if
#else
- # jcapel:
# If you end up here, please mail the list... This shouldn't
- # happen. ;-)
+ # happen. ;-) -- jcapel
+ #end if
+ ## If the interface is anything but a slave then add DNSn entry
+ #if $bonding.lower() != "slave"
+ #set $nct = 0
+ #for $nameserver in $name_servers
+ #set $nct = $nct + 1
+echo "DNS$nct=$nameserver" >> $devfile
+ #end for
#end if
-
- #set $nct = 0
- #for $nameserver in $name_servers
- #set $ct = $nct + 1
- echo "DNS$ct=$nameserver" >> $devfile
- #end for
-
#for $route in $static_routes
#set routepattern = $re.compile("[0-9/.]+:[0-9.]+")
#if $routepattern.match($route)
#set $routebits = $route.split(":")
#set [$network, $router] = $route.split(":")
- echo "$network via $router" >> $routesfile
+echo "$network via $router" >> $routesfile
#else
# Warning: invalid route "$route"
#end if
#end for
#set $i = $i + 1
- # End configuration for $iname
-#end for
-
+# End configuration for $iname
+ #end for
+ ## =============================================================================
+ ## Configure name server search path in /etc/resolv.conf
+ #if $name_servers_search != ""
+sed -i -e "/^search /d" /etc/resolv.conf
+echo -n "search " >>/etc/resolv.conf
+ #for $nameserversearch in $name_servers_search
+echo -n "$nameserversearch " >>/etc/resolv.conf
+ #end for
+echo "" >>/etc/resolv.conf
+ #end if
+ ## =============================================================================
+ ## Configure name server search path in /etc/resolv.conf
+ #if $name_servers_search != ""
+sed -i -e "/^nameserver /d" /etc/resolv.conf
+ #for $nameserver in $name_servers
+echo "nameserver $nameserver" >>/etc/resolv.conf
+ #end for
+ #end if
## Move all staged files to their final location
rm -f /etc/sysconfig/network-scripts/ifcfg-*
mv /etc/sysconfig/network-scripts/cobbler/* /etc/sysconfig/network-scripts/
rm -r /etc/sysconfig/network-scripts/cobbler
+if [ -f "/etc/modprobe.conf" ]; then
cat /etc/modprobe.conf.cobbler >> /etc/modprobe.conf
rm -f /etc/modprobe.conf.cobbler
-
+fi
#end if
-
# End post_install_network_config generated code
diff --git a/snippets/post_s390_reboot b/snippets/post_s390_reboot
new file mode 100644
index 00000000..aa38e40f
--- /dev/null
+++ b/snippets/post_s390_reboot
@@ -0,0 +1,67 @@
+## RHEL zVM installs do not properly reboot into the installed system. This
+## issue has been resolved in RHEL-5 Update3. To get a consistent reboot
+## behavior for s390* installs on all distros, this snippet can be used. The
+## snippet will attempt to discover the IPL volume zipl is being installed
+## to and will attempt a reipl. Be sure to set this snippet as the *last*
+## snippet your kickstart template.
+
+#if $arch.startswith("s390"):
+%post --nochroot
+
+# Does the kickstart file request a reboot?
+grep -q "^reboot" /tmp/ks.cfg /ks.cfg 2>/dev/null
+if [ \$? -ne 0 ]; then
+ exit 0
+fi
+
+# find out the location of /boot and use it to re-ipl
+boot_dev=""
+for mountpt in /mnt/sysimage/boot /mnt/sysimage;
+do
+ set -- \$(grep " $mountpt " /proc/mounts)
+ if [ -b "\$1" ]; then
+ boot_dev=\$1
+ break
+ fi
+done
+
+# lookup dasd disk
+if [[ \$boot_dev == *dasd* ]]; then
+ # remove the '/dev/' (aka basename)
+ boot_dev=\${boot_dev\#\#/[^/]*/}
+ # strip partition number from dasd device
+ boot_dev=\${boot_dev%%[0-9]}
+ type="ccw"
+ id=`basename \$(readlink /sys/block/\$boot_dev/device)`
+
+ # HACK - In RHEL4 and RHEL3 ... we do it the hard way
+ grep -q "^[34]\$" /.buildstamp 2>/dev/null
+ if [ \$? -eq 0 ]; then
+ cat <<EOF> /mnt/sysimage/tmp/zeboot.sh
+\#!/bin/bash
+/sbin/modprobe -r vmcp
+rm -f "/dev/vmcp"
+sleep 2
+[ -b "/dev/vmcp" ] || /bin/mknod /dev/vmcp c 10 61
+/sbin/modprobe -a vmcp
+sync
+# Force a boot (e.g. IPL 0100)
+/sbin/vmcp ipl \${id\#\#*.}
+EOF
+ /bin/chmod +x /mnt/sysimage/tmp/zeboot.sh
+ /bin/chroot /mnt/sysimage /tmp/zeboot.sh
+ # In RHEL5 ... lets cleanly shutdown (Update 3 and newer)
+ else
+ echo \$type > /sys/firmware/reipl/reipl_type
+ echo \$id > /sys/firmware/reipl/\$type/device
+
+ # Force a reboot
+ pid=\$(cat /var/run/init.pid)
+ [ -z "\$pid" ] && pid=\$(pidof init)
+ kill -12 \$pid
+ pid=\$(cat /var/run/loader.run)
+ [ -z "\$pid" ] && pid=\$(pidof loader)
+ kill \$pid
+ fi
+fi
+#end if
diff --git a/snippets/pre_anamon b/snippets/pre_anamon
new file mode 100644
index 00000000..636dc1bf
--- /dev/null
+++ b/snippets/pre_anamon
@@ -0,0 +1,4 @@
+#if $str($getVar('anamon_enabled','')) == "1"
+wget -O /tmp/anamon.py "http://$server/cobbler/aux/anamon.py"
+python /tmp/anamon.py --name "$name" --server "$server" --port "$http_port"
+#end if
diff --git a/snippets/pre_install_network_config b/snippets/pre_install_network_config
index daba6709..59d1cd3c 100644
--- a/snippets/pre_install_network_config
+++ b/snippets/pre_install_network_config
@@ -51,7 +51,7 @@
#end if
#end for
#end if
- #if $static.lower() == "true" and $ip != ""
+ #if $static and $ip != ""
#if $netmask == ""
## Netmask not provided, default to /24.
#set $netmask = "255.255.255.0"
@@ -60,7 +60,7 @@
#if $gateway != ""
#set $netinfo = "%s --gateway=%s" % ($netinfo, $gateway)
#end if
- #else if $static.lower() == "false"
+ #else if not $static
#set $netinfo = "--bootproto=dhcp"
#else
## Skip this interface, it's set as static, but without
diff --git a/snippets/redhat_register b/snippets/redhat_register
index 9d0f465c..ad3291ba 100644
--- a/snippets/redhat_register
+++ b/snippets/redhat_register
@@ -1,6 +1,5 @@
-
-#if $redhat_management_type != "off" and $redhat_management_key != ""
# begin Red Hat management server registration
+#if $redhat_management_type != "off" and $redhat_management_key != ""
mkdir -p /usr/share/rhn/
#if $redhat_management_type == "site"
#set $mycert = "/usr/share/rhn/RHN-ORG-TRUSTED-SSL-CERT"
@@ -11,8 +10,7 @@ wget http://$redhat_management_server/pub/RHN-ORG-TRUSTED-SSL-CERT -O $mycert
#end if
#set $endpoint = "https://%s/XMLRPC" % $redhat_management_server
rhnreg_ks --serverUrl=$endpoint --sslCACert=$mycert --activationkey=$redhat_management_key
-# end Red Hat management server registration
#else
# not configured to register to any Red Hat management server (ok)
#end if
-
+# end Red Hat management server registration