diff options
| author | Bob Gilligan <gilligan@vyatta.com> | 2011-09-01 18:02:09 -0700 |
|---|---|---|
| committer | Bob Gilligan <gilligan@vyatta.com> | 2011-09-01 18:02:09 -0700 |
| commit | f4edc32a5846f617be9781e52891be5617fd0595 (patch) | |
| tree | 47351a576bfccfe7b1d0a34e185a289857864586 /scripts | |
| parent | 6f4a4bcf798be9dab84a7b9a57c73d705bf4b82b (diff) | |
| download | vyatta-cfg-system-f4edc32a5846f617be9781e52891be5617fd0595.tar.gz vyatta-cfg-system-f4edc32a5846f617be9781e52891be5617fd0595.zip | |
Bugfix 7488: Configure Xen PV console hvc0 in Vyatta config file.
Previously, the install-image program was adding a line to
/etc/inittab in the image being installed. This change adds a console
entry to the Vyatta config file instead. Because of that entry, the
system automatically generates a console entry for hvc0 in
/etc/inittab at boot time.
I also removed the code in install-image that added a line to
/etc/fstab to mount /proc/xen. This is no longer necessary because
the /etc/init.d/xe-linux-distribution startup script now mounts
/proc/xen.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/install/install-functions | 14 | ||||
| -rwxr-xr-x | scripts/install/install-postinst-new | 10 |
2 files changed, 16 insertions, 8 deletions
diff --git a/scripts/install/install-functions b/scripts/install/install-functions index 5e24a921..0cca8944 100755 --- a/scripts/install/install-functions +++ b/scripts/install/install-functions @@ -230,6 +230,20 @@ select_drive () { echo } + +# Add a console entry to the config file. +# $1: Console device name (e.g. ttyS0) +# $2: Path to config file +# +add_console_entry () { + console_dev=$1 + config_file=$2 + sed -i -e "/console {/a \ \ + device $console_dev {\n\ + speed 9600\n\ + }" $config_file +} + # $1: user name # $2: encrypted password # $3: config file diff --git a/scripts/install/install-postinst-new b/scripts/install/install-postinst-new index d2065220..d782a5bf 100755 --- a/scripts/install/install-postinst-new +++ b/scripts/install/install-postinst-new @@ -158,14 +158,8 @@ setup_xen_extras () { echo "kernel $xen_grub_boot_path/vmlinuz root=/dev/$rootdev boot=live vyatta-union=$xen_grub_boot_path console=hvc0" >> $grubfile echo "initrd $xen_grub_boot_path/initrd.img" >> $grubfile - # Add /proc/xen entry to fstab - echo "xenfs /proc/xen xenfs defaults 0 0" >> $INST_ROOT/etc/fstab - - # Comment out serial port entry and add Xen console entry to inittab. - inittab=$INST_ROOT/etc/inittab - sed -i -e 's/^T0/#T0/' $inittab - echo "" >> $inittab - echo "h0:12345:respawn:/sbin/getty 38400 hvc0" >> $inittab + # Add console port entry for the Xen PV console + add_console_entry hvc0 "${INST_ROOT}${VYATTA_CFG_DIR}/config.boot" } check_for_xen_extras () { |