diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2007-02-15 18:06:30 -0500 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2007-02-15 18:06:30 -0500 |
| commit | c60f8e15d134f9207e4ba5a6a7c32f32263a98a7 (patch) | |
| tree | ed889797c53290b3a9d0068e9ed22724fb0cc5c5 | |
| parent | db4ad69cb019e2b633f839edae6127132b86ee54 (diff) | |
| download | third_party-cobbler-c60f8e15d134f9207e4ba5a6a7c32f32263a98a7.tar.gz third_party-cobbler-c60f8e15d134f9207e4ba5a6a7c32f32263a98a7.tar.xz third_party-cobbler-c60f8e15d134f9207e4ba5a6a7c32f32263a98a7.zip | |
Escape dollar signs (related to new Cheetah changes). All dollar signs do not need to be escaped but onces that look like $(list-hard-drives) do. Cheetah is set to not-substitute $foo if it doesn't know what a $foo is, but other variants of near-Cheetah syntax require escaping.
| -rw-r--r-- | kickstart_fc5.ks | 14 | ||||
| -rw-r--r-- | kickstart_fc6.ks | 14 | ||||
| -rw-r--r-- | kickstart_fc6_domU.ks | 8 |
3 files changed, 18 insertions, 18 deletions
diff --git a/kickstart_fc5.ks b/kickstart_fc5.ks index db4dd19..d13b034 100644 --- a/kickstart_fc5.ks +++ b/kickstart_fc5.ks @@ -23,7 +23,7 @@ network --bootproto=dhcp --device=eth0 --onboot=on reboot #Root password -rootpw --iscrypted $1$mF86/UHC$WvcIcX2t6crBz2onWxyac. +rootpw --iscrypted \$1\$mF86/UHC\$WvcIcX2t6crBz2onWxyac. # SELinux configuration selinux --disabled # Do not configure the X Window System @@ -39,14 +39,14 @@ zerombr %pre # Determine how many drives we have -set $(list-harddrives) -let numd=$#/2 -d1=$1 -d2=$3 +set \$(list-harddrives) +let numd=\$#/2 +d1=\$1 +d2=\$3 cat << EOF >> /tmp/partinfo -part / --fstype ext3 --size=1024 --grow --ondisk=$d1 --asprimary -part swap --size=1024 --ondisk=$d1 --asprimary +part / --fstype ext3 --size=1024 --grow --ondisk=\$d1 --asprimary +part swap --size=1024 --ondisk=\$d1 --asprimary #EOF %packages diff --git a/kickstart_fc6.ks b/kickstart_fc6.ks index fd9d7a1..b696e9e 100644 --- a/kickstart_fc6.ks +++ b/kickstart_fc6.ks @@ -25,7 +25,7 @@ network --bootproto=dhcp --device=eth0 --onboot=on reboot #Root password -rootpw --iscrypted $1$mF86/UHC$WvcIcX2t6crBz2onWxyac. +rootpw --iscrypted \$1\$mF86/UHC\$WvcIcX2t6crBz2onWxyac. # SELinux configuration selinux --disabled # Do not configure the X Window System @@ -41,14 +41,14 @@ zerombr %pre # Determine how many drives we have -set $(list-harddrives) -let numd=$#/2 -d1=$1 -d2=$3 +set \$(list-harddrives) +let numd=\$#/2 +d1=\$1 +d2=\$3 cat << EOF >> /tmp/partinfo -part / --fstype ext3 --size=1024 --grow --ondisk=$d1 --asprimary -part swap --size=1024 --ondisk=$d1 --asprimary +part / --fstype ext3 --size=1024 --grow --ondisk=\$d1 --asprimary +part swap --size=1024 --ondisk=\$d1 --asprimary #EOF %packages diff --git a/kickstart_fc6_domU.ks b/kickstart_fc6_domU.ks index a9df434..d480985 100644 --- a/kickstart_fc6_domU.ks +++ b/kickstart_fc6_domU.ks @@ -4,13 +4,13 @@ install reboot -url --url=TEMPLATE::tree +url --url=$tree lang en_US.UTF-8 keyboard us xconfig --driver "fbdev" --resolution 800x600 --depth 24 network --device eth0 --bootproto dhcp -rootpw --iscrypted $1$mF86/UHC$WvcIcX2t6crBz2onWxyac. +rootpw --iscrypted \$1\$mF86/UHC\$WvcIcX2t6crBz2onWxyac. firewall --enabled --port=22:tcp authconfig --enableshadow --enablemd5 selinux --disabled @@ -34,6 +34,6 @@ openssh-server yum %post -TEMPLATE::yum_config_stanza -TEMPLATE::kickstart_done +$yum_config_stanza +$kickstart_done |