diff options
| author | Bob Gilligan <gilligan@vyatta.com> | 2010-03-08 16:17:44 -0800 |
|---|---|---|
| committer | Bob Gilligan <gilligan@vyatta.com> | 2010-03-08 16:17:44 -0800 |
| commit | e2f63b6d1e8c387d89cad1dc649b218f64dcd5c5 (patch) | |
| tree | 967f3e0b94334b3ab4e5e1e3c32fd31c60ea022c | |
| parent | bc7a72c27460e14a4f296faff6e345e42c95bc60 (diff) | |
| download | vyatta-cfg-system-e2f63b6d1e8c387d89cad1dc649b218f64dcd5c5.tar.gz vyatta-cfg-system-e2f63b6d1e8c387d89cad1dc649b218f64dcd5c5.zip | |
Bugfix 5416: determine system version from version of vyatta-version package
| -rwxr-xr-x | scripts/install-system | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/install-system b/scripts/install-system index 68584445..b17ede78 100755 --- a/scripts/install-system +++ b/scripts/install-system @@ -894,7 +894,7 @@ create_partitions() { # $1 is the partition to install on install_root_filesystem () { ldrive=$1 - version=$(egrep -i version /opt/vyatta/etc/version | awk '{ print $3 }') + version=`dpkg-query --showformat='${Version}' --show vyatta-version` dpkg="/usr/bin/dpkg --force-all --root=$rootfsdir" echo "Mounting /dev/$ldrive " @@ -1121,7 +1121,7 @@ install_grub () { fi fi - version=$(egrep -i version /opt/vyatta/etc/version | awk '{ print $3 }') + version=`dpkg-query --showformat='${Version}' --show vyatta-version` # if union install tell vyatta-grub-setup if [ ! -z $UNION ]; then @@ -1577,7 +1577,7 @@ if [ -n "$UNION" ]; then # set up root for postinst postinst_root=/mnt/postinst_root writable_root=$rootfsdir - version=$(egrep -i version /opt/vyatta/etc/version | awk '{ print $3 }') + version=`dpkg-query --showformat='${Version}' --show vyatta-version` rw_dir=$rootfsdir/boot/$version/live-rw mkdir -p $postinst_root /mnt/squashfs |