summaryrefslogtreecommitdiff
path: root/scripts/install/install-functions
diff options
context:
space:
mode:
authorBob Gilligan <gilligan@vyatta.com>2011-09-01 18:02:09 -0700
committerBob Gilligan <gilligan@vyatta.com>2011-09-01 18:02:09 -0700
commitf4edc32a5846f617be9781e52891be5617fd0595 (patch)
tree47351a576bfccfe7b1d0a34e185a289857864586 /scripts/install/install-functions
parent6f4a4bcf798be9dab84a7b9a57c73d705bf4b82b (diff)
downloadvyatta-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/install/install-functions')
-rwxr-xr-xscripts/install/install-functions14
1 files changed, 14 insertions, 0 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