diff options
| author | jpaetzel <jpaetzel@FreeBSD.org> | 2011-09-19 05:12:53 +0000 |
|---|---|---|
| committer | jpaetzel <jpaetzel@FreeBSD.org> | 2011-09-19 05:12:53 +0000 |
| commit | d3ab0cf954ad6a22d6d4abd24a9711534e70af19 (patch) | |
| tree | 1fec4b3768a98ffaf158f7aef4d80eae6d13b2ca /usr.sbin/pc-sysinstall/backend/parseconfig.sh | |
| parent | 55278d20da7e1685274612bda3ff81211ee24e98 (diff) | |
| download | FreeBSD-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/parseconfig.sh')
| -rwxr-xr-x | usr.sbin/pc-sysinstall/backend/parseconfig.sh | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/usr.sbin/pc-sysinstall/backend/parseconfig.sh b/usr.sbin/pc-sysinstall/backend/parseconfig.sh index eeb6ce0..2e16751 100755 --- a/usr.sbin/pc-sysinstall/backend/parseconfig.sh +++ b/usr.sbin/pc-sysinstall/backend/parseconfig.sh @@ -58,12 +58,8 @@ fi # Set our config file variable CFGF="$1" -# Check the dirname of the provided CFGF and make sure its a full path -DIR="`dirname ${CFGF}`" -if [ "${DIR}" = "." ] -then - CFGF="`pwd`/${CFGF}" -fi +# Resolve any relative pathing +CFGF="`realpath ${CFGF}`" export CFGF # Start by doing a sanity check, which will catch any obvious mistakes in the config @@ -72,7 +68,7 @@ file_sanity_check "installMode installType installMedium packageType" # We passed the Sanity check, lets grab some of the universal config settings and store them check_value installMode "fresh upgrade extract" check_value installType "PCBSD FreeBSD" -check_value installMedium "dvd usb ftp rsync image" +check_value installMedium "dvd usb ftp rsync image local" check_value packageType "uzip tar rsync split" if_check_value_exists partition "all s1 s2 s3 s4 free image" if_check_value_exists mirrorbal "load prefer round-robin split" |
