summaryrefslogtreecommitdiffstats
path: root/usr.sbin/pc-sysinstall/backend/functions-parse.sh
diff options
context:
space:
mode:
authorjpaetzel <jpaetzel@FreeBSD.org>2011-09-19 05:12:53 +0000
committerjpaetzel <jpaetzel@FreeBSD.org>2011-09-19 05:12:53 +0000
commitd3ab0cf954ad6a22d6d4abd24a9711534e70af19 (patch)
tree1fec4b3768a98ffaf158f7aef4d80eae6d13b2ca /usr.sbin/pc-sysinstall/backend/functions-parse.sh
parent55278d20da7e1685274612bda3ff81211ee24e98 (diff)
downloadFreeBSD-src-d3ab0cf954ad6a22d6d4abd24a9711534e70af19.zip
FreeBSD-src-d3ab0cf954ad6a22d6d4abd24a9711534e70af19.tar.gz
Fix a logic bug in pc-sysinstall creating partitions.
Improve exit when an error occurs. Fix parsing to grab values which contain extra '=' signs. Fix a bug setting the timezone properly. Fix a usage bug when setting up with gmirror. Allow a uzip file from local media to be used. Allow specifying flags for "newfs" when using UFS as the file system. Run custom commands after doing final cleanup / fstab generation and such. Also fix using relative path for config file. Approved by: re (bz)
Diffstat (limited to 'usr.sbin/pc-sysinstall/backend/functions-parse.sh')
-rwxr-xr-xusr.sbin/pc-sysinstall/backend/functions-parse.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/pc-sysinstall/backend/functions-parse.sh b/usr.sbin/pc-sysinstall/backend/functions-parse.sh
index 4f96ca3..8b9d418 100755
--- a/usr.sbin/pc-sysinstall/backend/functions-parse.sh
+++ b/usr.sbin/pc-sysinstall/backend/functions-parse.sh
@@ -33,7 +33,7 @@ get_value_from_string()
{
if [ -n "${1}" ]
then
- export VAL="`echo ${1} | cut -d '=' -f 2`"
+ export VAL="`echo ${1} | cut -d '=' -f 2-15`"
else
echo "Error: Did we forgot to supply a string to parse?"
exit 1
@@ -45,7 +45,7 @@ get_value_from_cfg_with_spaces()
{
if [ -n "${1}" ]
then
- export VAL=`grep "^${1}=" ${CFGF} | head -n 1 | cut -d '=' -f 2`
+ export VAL=`grep "^${1}=" ${CFGF} | head -n 1 | cut -d '=' -f 2-15`
else
exit_err "Error: Did we forgot to supply a setting to grab?"
fi
@@ -57,7 +57,7 @@ get_value_from_cfg()
{
if [ -n "${1}" ]
then
- export VAL=`grep "^${1}=" ${CFGF} | head -n 1 | cut -d '=' -f 2 | tr -d ' '`
+ export VAL=`grep "^${1}=" ${CFGF} | head -n 1 | cut -d '=' -f 2-15 | tr -d ' '`
else
exit_err "Error: Did we forgot to supply a setting to grab?"
fi
OpenPOWER on IntegriCloud