diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-03-09 10:34:29 -0800 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-03-09 10:34:29 -0800 |
| commit | eda28eadc0e429150a6575f4de99ea6ea1101000 (patch) | |
| tree | 232d08d086cfcde66d8c6441e55b6d9bca425718 /scripts/install-system | |
| parent | 0dbc66ed17d3a18f540d24e3e143089a7dc26f1e (diff) | |
| parent | 2dab8bb6de2faefd3a9289647a150d04116d4500 (diff) | |
| download | vyatta-cfg-system-eda28eadc0e429150a6575f4de99ea6ea1101000.tar.gz vyatta-cfg-system-eda28eadc0e429150a6575f4de99ea6ea1101000.zip | |
Merge branch 'larkspur' of suva.vyatta.com:/git/vyatta-cfg-system into larkspur
Diffstat (limited to 'scripts/install-system')
| -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 |